Remove lib/renderer/api/ipc-renderer-setup.js

This file is no longer required since sandboxed renderer directly imports
ipc-renderer.js.

diff --git a/filenames.gypi b/filenames.gypi
index 2404574..44a6fbf 100644 (file)
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -68,7 +68,6 @@
       'lib/renderer/api/desktop-capturer.js',
       'lib/renderer/api/exports/electron.js',
       'lib/renderer/api/ipc-renderer.js',
-      'lib/renderer/api/ipc-renderer-setup.js',
       'lib/renderer/api/module-list.js',
       'lib/renderer/api/remote.js',
       'lib/renderer/api/screen.js',
@@ -79,7 +78,6 @@
       'lib/renderer/extensions/web-navigation.js',
     ],
     'browserify_entries': [
-      'lib/renderer/api/ipc-renderer-setup.js',
       'lib/sandboxed_renderer/init.js',
       'lib/sandboxed_renderer/api/exports/electron.js',
     ],

diff --git a/lib/renderer/api/ipc-renderer-setup.js b/lib/renderer/api/ipc-renderer-setup.js
deleted file mode 100644 (file)
index c899452..0000000
--- a/lib/renderer/api/ipc-renderer-setup.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Any requires added here need to be added to the browserify_entries array
-// in filenames.gypi so they get built into the preload_bundle.js bundle
-
-module.exports = function (ipcRenderer, binding) {
-  ipcRenderer.send = function (...args) {
-    return binding.send('ipc-message', args)
-  }
-
-  ipcRenderer.sendSync = function (...args) {
-    return JSON.parse(binding.sendSync('ipc-message-sync', args))
-  }
-
-  ipcRenderer.sendToHost = function (...args) {
-    return binding.send('ipc-message-host', args)
-  }
-
-  ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
-    if (typeof webContentsId !== 'number') {
-      throw new TypeError('First argument has to be webContentsId')
-    }
-
-    ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', false, webContentsId, channel, ...args)
-  }
-
-  ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
-    if (typeof webContentsId !== 'number') {
-      throw new TypeError('First argument has to be webContentsId')
-    }
-
-    ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', true, webContentsId, channel, ...args)
-  }
-
-  const removeAllListeners = ipcRenderer.removeAllListeners.bind(ipcRenderer)
-  ipcRenderer.removeAllListeners = function (...args) {
-    if (args.length === 0) {
-      throw new Error('Removing all listeners from ipcRenderer will make Electron internals stop working.  Please specify a event name')
-    }
-    removeAllListeners(...args)
-  }
-}

diff --git a/lib/renderer/api/ipc-renderer.js b/lib/renderer/api/ipc-renderer.js
index 0a84a0d..d173adb 100644 (file)
--- a/lib/renderer/api/ipc-renderer.js
+++ b/lib/renderer/api/ipc-renderer.js
@@ -5,6 +5,41 @@ const v8Util = process.atomBinding('v8_util')
 
 // Created by init.js.
 const ipcRenderer = v8Util.getHiddenValue(global, 'ipc')
-require('./ipc-renderer-setup')(ipcRenderer, binding)
+
+ipcRenderer.send = function (...args) {
+  return binding.send('ipc-message', args)
+}
+
+ipcRenderer.sendSync = function (...args) {
+  return JSON.parse(binding.sendSync('ipc-message-sync', args))
+}
+
+ipcRenderer.sendToHost = function (...args) {
+  return binding.send('ipc-message-host', args)
+}
+
+ipcRenderer.sendTo = function (webContentsId, channel, ...args) {
+  if (typeof webContentsId !== 'number') {
+    throw new TypeError('First argument has to be webContentsId')
+  }
+
+  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', false, webContentsId, channel, ...args)
+}
+
+ipcRenderer.sendToAll = function (webContentsId, channel, ...args) {
+  if (typeof webContentsId !== 'number') {
+    throw new TypeError('First argument has to be webContentsId')
+  }
+
+  ipcRenderer.send('ELECTRON_BROWSER_SEND_TO', true, webContentsId, channel, ...args)
+}
+
+const removeAllListeners = ipcRenderer.removeAllListeners.bind(ipcRenderer)
+ipcRenderer.removeAllListeners = function (...args) {
+  if (args.length === 0) {
+    throw new Error('Removing all listeners from ipcRenderer will make Electron internals stop working.  Please specify a event name')
+  }
+  removeAllListeners(...args)
+}
 
 module.exports = ipcRenderer