Export loadDevToolsExtensions API to use in guest view manager

diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index dfab37b..f1515d8 100644 (file)
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -317,13 +317,13 @@ app.once('ready', function () {
   const init = BrowserWindow.prototype._init
   BrowserWindow.prototype._init = function () {
     init.call(this)
-    this._loadDevToolsExtensions(this.webContents)
-  }
-
-  BrowserWindow.prototype._loadDevToolsExtensions = function (webContents) {
-    hookWindowForTabEvents(webContents)
-    webContents.on('devtools-opened', function () {
-      loadDevToolsExtensions(webContents, objectValues(manifestMap))
-    })
+    exports.loadDevToolsExtensions(this.webContents)
   }
 })
+
+exports.loadDevToolsExtensions = function (webContents) {
+  hookWindowForTabEvents(webContents)
+  webContents.on('devtools-opened', function () {
+    loadDevToolsExtensions(webContents, objectValues(manifestMap))
+  })
+}

diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js
index 61ab767..e810aa5 100644 (file)
--- a/lib/browser/guest-view-manager.js
+++ b/lib/browser/guest-view-manager.js
@@ -1,6 +1,8 @@
 'use strict'
 
-const {BrowserWindow, ipcMain, webContents} = require('electron')
+const ChromeExtension = require('./chrome-extension')
+const ipcMain = require('electron').ipcMain
+const webContents = require('electron').webContents
 
 // Doesn't exist in early initialization.
 let webViewManager = null
@@ -150,8 +152,7 @@ const createGuest = function (embedder, params) {
   })
 
   // Enable DevTools extensions in guest view
-  const window = BrowserWindow.fromWebContents(embedder)
-  if (window) window._loadDevToolsExtensions(guest)
+  ChromeExtension.loadDevToolsExtensions(guest)
 
   return id
 }