From 3e29cd57626945827d6930bfea5d31760184fa8a Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@github.com>
Date: Thu, 18 Feb 2016 23:50:27 -0800
Subject: [PATCH] Merge branch 'master' into dh-expose-updates

---
 src/application-delegate.coffee     | 18 +++++++++---------
 src/browser/atom-application.coffee |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/application-delegate.coffee b/src/application-delegate.coffee
index f70bd7d0c..2aaeb35ff 100644
--- a/src/application-delegate.coffee
+++ b/src/application-delegate.coffee
@@ -186,31 +186,31 @@ class ApplicationDelegate
     @onUpdateAvailable(callback)
 
   onDidBeginCheckingForUpdate: (callback) ->
-    outerCallback = (message, detail) ->
+    outerCallback = (event, message, detail) ->
       if message is 'checking-for-update'
         callback(detail)
 
-    ipc.on('message', outerCallback)
+    ipcRenderer.on('message', outerCallback)
     new Disposable ->
-      ipc.removeListener('message', outerCallback)
+      ipcRenderer.removeListener('message', outerCallback)
 
   onDidCompleteDownloadingUpdate: (callback) ->
-    outerCallback = (message, detail) ->
+    outerCallback = (event, message, detail) ->
       if message is 'update-available'
         callback(detail)
 
-    ipc.on('message', outerCallback)
+    ipcRenderer.on('message', outerCallback)
     new Disposable ->
-      ipc.removeListener('message', outerCallback)
+      ipcRenderer.removeListener('message', outerCallback)
 
   onUpdateNotAvailable: (callback) ->
-    outerCallback = (message, detail) ->
+    outerCallback = (event, message, detail) ->
       if message is 'update-not-available'
         callback(detail)
 
-    ipc.on('message', outerCallback)
+    ipcRenderer.on('message', outerCallback)
     new Disposable ->
-      ipc.removeListener('message', outerCallback)
+      ipcRenderer.removeListener('message', outerCallback)
 
 
   onApplicationMenuCommand: (callback) ->
diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index ebcc9717b..fad69b967 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -307,6 +307,9 @@ class AtomApplication
     ipcMain.on 'check-for-update', =>
       @autoUpdateManager.check()
 
+    ipcMain.on 'execute-javascript-in-dev-tools', (event, code) ->
+      event.sender.devToolsWebContents?.executeJavaScript(code)
+
   setupDockMenu: ->
     if process.platform is 'darwin'
       dockMenu = Menu.buildFromTemplate [