From d6fa46accec1191971fcf20dffa7ffd9f9bdd8bc Mon Sep 17 00:00:00 2001
From: Wliu <Wliu1402@gmail.com>
Date: Sat, 12 Dec 2015 13:22:22 -0500
Subject: [PATCH] Update browser files to use require 'electron'

---
 src/browser/application-menu.coffee      | 3 +--
 src/browser/atom-protocol-handler.coffee | 3 +--
 src/browser/atom-window.coffee           | 4 +---
 src/browser/auto-update-manager.coffee   | 6 +++---
 src/browser/auto-updater-win32.coffee    | 4 ++--
 src/browser/context-menu.coffee          | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index f742c3a54..fef9f90fa 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -1,5 +1,4 @@
-app = require 'app'
-Menu = require 'menu'
+{app, Menu} = require 'electron'
 _ = require 'underscore-plus'
 
 # Used to manage the global application menu.
diff --git a/src/browser/atom-protocol-handler.coffee b/src/browser/atom-protocol-handler.coffee
index 0fda8095b..3967c0525 100644
--- a/src/browser/atom-protocol-handler.coffee
+++ b/src/browser/atom-protocol-handler.coffee
@@ -1,7 +1,6 @@
-app = require 'app'
+{app, protocol} = require 'electron'
 fs = require 'fs'
 path = require 'path'
-protocol = require 'protocol'
 
 # Handles requests with 'atom' protocol.
 #
diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index 6a36b55eb..ace12239e 100644
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -1,6 +1,4 @@
-BrowserWindow = require 'browser-window'
-app = require 'app'
-dialog = require 'dialog'
+{BrowserWindow, app, dialog} = require 'electron'
 path = require 'path'
 fs = require 'fs'
 url = require 'url'
diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee
index f4a493829..63a79b60f 100644
--- a/src/browser/auto-update-manager.coffee
+++ b/src/browser/auto-update-manager.coffee
@@ -25,7 +25,7 @@ class AutoUpdateManager
     if process.platform is 'win32'
       autoUpdater = require './auto-updater-win32'
     else
-      autoUpdater = require 'auto-updater'
+      {autoUpdater} = require 'electron'
 
     autoUpdater.on 'error', (event, message) =>
       @setState(ErrorState)
@@ -91,7 +91,7 @@ class AutoUpdateManager
 
   onUpdateNotAvailable: =>
     autoUpdater.removeListener 'error', @onUpdateError
-    dialog = require 'dialog'
+    {dialog} = require 'electron'
     dialog.showMessageBox
       type: 'info'
       buttons: ['OK']
@@ -102,7 +102,7 @@ class AutoUpdateManager
 
   onUpdateError: (event, message) =>
     autoUpdater.removeListener 'update-not-available', @onUpdateNotAvailable
-    dialog = require 'dialog'
+    {dialog} = require 'electron'
     dialog.showMessageBox
       type: 'warning'
       buttons: ['OK']
diff --git a/src/browser/auto-updater-win32.coffee b/src/browser/auto-updater-win32.coffee
index 13dcd9a1e..e31578d49 100644
--- a/src/browser/auto-updater-win32.coffee
+++ b/src/browser/auto-updater-win32.coffee
@@ -9,9 +9,9 @@ class AutoUpdater
 
   quitAndInstall: ->
     if SquirrelUpdate.existsSync()
-      SquirrelUpdate.restartAtom(require('app'))
+      SquirrelUpdate.restartAtom(require('electron').app)
     else
-      require('auto-updater').quitAndInstall()
+      require('electron').autoUpdater.quitAndInstall()
 
   downloadUpdate: (callback) ->
     SquirrelUpdate.spawn ['--download', @updateUrl], (error, stdout) ->
diff --git a/src/browser/context-menu.coffee b/src/browser/context-menu.coffee
index 44b57cdc9..1bc9c29ba 100644
--- a/src/browser/context-menu.coffee
+++ b/src/browser/context-menu.coffee
@@ -1,4 +1,4 @@
-Menu = require 'menu'
+{Menu} = require 'electron'
 
 module.exports =
 class ContextMenu