Merge pull request electron#212 from electron/windows-icon

Update windows Tray icon

Author: Jessica Lord

main-process/native-ui/tray/tray.js

@@ -2,20 +2,22 @@ const path = require('path')
 const electron = require('electron')
 const ipc = electron.ipcMain
 const app = electron.app
+const Menu = electron.Menu
+const Tray = electron.Tray
 
 let appIcon = null
 
 ipc.on('put-in-tray', function (event) {
-  const iconPath = path.join(__dirname, 'iconTemplate.png')
-  appIcon = new electron.Tray(iconPath)
-  const contextMenu = electron.Menu.buildFromTemplate([
-    { label: 'Remove',
-      click: function (menuItem, browserWindow) {
-        event.sender.send('tray-removed')
-        appIcon.destroy()
-      }
+  const iconName = process.platform === 'win32' ? 'windows-icon.png' : 'iconTemplate.png'
+  const iconPath = path.join(__dirname, iconName)
+  appIcon = new Tray(iconPath)
+  const contextMenu = Menu.buildFromTemplate([{
+    label: 'Remove',
+    click: function () {
+      event.sender.send('tray-removed')
+      appIcon.destroy()
     }
-  ])
+  }])
   appIcon.setToolTip('Electron Demo in the tray.')
   appIcon.setContextMenu(contextMenu)
 })