mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Export loadDevToolsExtensions API to use in guest view manager

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-07 11:00:58 -07:00
parent 219d177731
commit ec8b9e3f35
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/browser/chrome-extension.js
View file

@ -317,13 +317,13 @@ app.once('ready', function () {
const init = BrowserWindow.prototype._init const init = BrowserWindow.prototype._init
BrowserWindow.prototype._init = function () { BrowserWindow.prototype._init = function () {
init.call(this) init.call(this)
this._loadDevToolsExtensions(this.webContents) exports.loadDevToolsExtensions(this.webContents)
}
BrowserWindow.prototype._loadDevToolsExtensions = function (webContents) {
hookWindowForTabEvents(webContents)
webContents.on('devtools-opened', function () {
loadDevToolsExtensions(webContents, objectValues(manifestMap))
})
} }
}) })
exports.loadDevToolsExtensions = function (webContents) {
hookWindowForTabEvents(webContents)
webContents.on('devtools-opened', function () {
loadDevToolsExtensions(webContents, objectValues(manifestMap))
})
}

7
lib/browser/guest-view-manager.js
View file

@ -1,6 +1,8 @@
'use strict' '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. // Doesn't exist in early initialization.
let webViewManager = null let webViewManager = null
@ -150,8 +152,7 @@ const createGuest = function (embedder, params) {
}) })
// Enable DevTools extensions in guest view // Enable DevTools extensions in guest view
const window = BrowserWindow.fromWebContents(embedder) ChromeExtension.loadDevToolsExtensions(guest)
if (window) window._loadDevToolsExtensions(guest)
return id return id
} }