Merge pull request #5894 from electron/chrome-runtime-id
Implement chrome.runtime.id
This commit is contained in:
commit
08f8e06c55
3 changed files with 9 additions and 4 deletions
|
@ -99,6 +99,8 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
|
||||||
})
|
})
|
||||||
|
|
||||||
chrome.runtime = {
|
chrome.runtime = {
|
||||||
|
id: extensionId,
|
||||||
|
|
||||||
getURL: function (path) {
|
getURL: function (path) {
|
||||||
return url.format({
|
return url.format({
|
||||||
protocol: 'chrome-extension',
|
protocol: 'chrome-extension',
|
||||||
|
|
|
@ -863,7 +863,7 @@ describe('browser-window module', function () {
|
||||||
w.webContents.openDevTools({mode: 'bottom'})
|
w.webContents.openDevTools({mode: 'bottom'})
|
||||||
|
|
||||||
ipcMain.once('answer', function (event, message) {
|
ipcMain.once('answer', function (event, message) {
|
||||||
assert.equal(message, 'extension loaded')
|
assert.equal(message.runtimeId, 'foo')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -873,8 +873,8 @@ describe('browser-window module', function () {
|
||||||
it('creates the extension', function (done) {
|
it('creates the extension', function (done) {
|
||||||
w.webContents.openDevTools({mode: 'undocked'})
|
w.webContents.openDevTools({mode: 'undocked'})
|
||||||
|
|
||||||
ipcMain.once('answer', function (event, message) {
|
ipcMain.once('answer', function (event, message, extensionId) {
|
||||||
assert.equal(message, 'extension loaded')
|
assert.equal(message.runtimeId, 'foo')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title></title>
|
<title></title>
|
||||||
<script>
|
<script>
|
||||||
var sendMessage = `require('electron').ipcRenderer.send('answer', 'extension loaded')`
|
var message = JSON.stringify({
|
||||||
|
runtimeId: chrome.runtime.id
|
||||||
|
})
|
||||||
|
var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`
|
||||||
window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
|
window.chrome.devtools.inspectedWindow.eval(sendMessage, function () {})
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue