Merge pull request #5648 from electron/chrome51

Update to Chrome 51
This commit is contained in:
Cheng Zhao 2016-05-24 10:59:11 +00:00
commit 28e2058ff1
141 changed files with 452 additions and 433 deletions

View file

@ -1,4 +1,7 @@
window.onload = function () {
// Make sure |window.chrome| is defined for devtools extensions.
hijackSetInjectedScript(window.InspectorFrontendHost)
// Use menu API to show context menu.
window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
@ -6,6 +9,18 @@ window.onload = function () {
window.WebInspector.createFileSelectorElement = createFileSelectorElement
}
const hijackSetInjectedScript = function (InspectorFrontendHost) {
const {setInjectedScriptForOrigin} = InspectorFrontendHost
InspectorFrontendHost.setInjectedScriptForOrigin = function (origin, source) {
const wrapped = `(function (...args) {
window.chrome = {}
const original = ${source}
original(...args)
})`
setInjectedScriptForOrigin(origin, wrapped)
}
}
var convertToMenuTemplate = function (items) {
var fn, i, item, len, template
template = []