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

Pass nativeWindowOpen flag to isolated init.js

Browse source
This commit is contained in:
Ryohei Ikegami 2017-04-30 19:35:41 +09:00
parent 0034b306f5
commit 8b6b512485
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/renderer/atom_renderer_client.cc
View file

@ -206,6 +206,8 @@ void AtomRendererClient::SetupMainWorldOverrides(
dict.Set(options::kOpenerID, dict.Set(options::kOpenerID,
command_line->GetSwitchValueASCII(switches::kOpenerID)); command_line->GetSwitchValueASCII(switches::kOpenerID));
dict.Set("hiddenPage", command_line->HasSwitch(switches::kHiddenPage)); dict.Set("hiddenPage", command_line->HasSwitch(switches::kHiddenPage));
dict.Set("nativeWindowOpen",
command_line->HasSwitch(switches::kNativeWindowOpen));
v8::Local<v8::Value> args[] = { binding }; v8::Local<v8::Value> args[] = { binding };
ignore_result(func->Call(context, v8::Null(isolate), 1, args)); ignore_result(func->Call(context, v8::Null(isolate), 1, args));

4
lib/isolated_renderer/init.js
View file

@ -19,8 +19,8 @@ const ipcRenderer = {
once () {} once () {}
} }
let {guestInstanceId, hiddenPage, openerId} = binding let {guestInstanceId, hiddenPage, openerId, nativeWindowOpen} = binding
if (guestInstanceId != null) guestInstanceId = parseInt(guestInstanceId) if (guestInstanceId != null) guestInstanceId = parseInt(guestInstanceId)
if (openerId != null) openerId = parseInt(openerId) if (openerId != null) openerId = parseInt(openerId)
require('../renderer/window-setup')(ipcRenderer, guestInstanceId, openerId, hiddenPage) require('../renderer/window-setup')(ipcRenderer, guestInstanceId, openerId, hiddenPage, nativeWindowOpen)