github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-23 06:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Inherit owner window in devtools

Browse Source
This commit is contained in:
Cheng Zhao
2015-10-01 14:41:01 +08:00
parent 1045bbc861
commit ca40ea8e2f
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View File

@@ -506,6 +506,11 @@ void WebContents::DevToolsOpened() {
isolate(), managed_web_contents()->GetDevToolsWebContents());
devtools_web_contents_.Reset(isolate(), handle.ToV8());
// Inherit owner window in devtools.
if (owner_window())
handle->SetOwnerWindow(managed_web_contents()->GetDevToolsWebContents(),
owner_window());
Emit("devtools-opened");
}

6
atom/browser/common_web_contents_delegate.cc
View File

@@ -136,7 +136,11 @@ void CommonWebContentsDelegate::InitWithWebContents(
}
void CommonWebContentsDelegate::SetOwnerWindow(NativeWindow* owner_window) {
content::WebContents* web_contents = GetWebContents();
SetOwnerWindow(GetWebContents(), owner_window);
}
void CommonWebContentsDelegate::SetOwnerWindow(
content::WebContents* web_contents, NativeWindow* owner_window) {
owner_window_ = owner_window->GetWeakPtr();
NativeWindowRelay* relay = new NativeWindowRelay(owner_window_);
web_contents->SetUserData(relay->key, relay);

2
atom/browser/common_web_contents_delegate.h
View File

@@ -34,6 +34,8 @@ class CommonWebContentsDelegate
// Set the window as owner window.
void SetOwnerWindow(NativeWindow* owner_window);
void SetOwnerWindow(content::WebContents* web_contents,
NativeWindow* owner_window);
// Destroy the managed InspectableWebContents object.
void DestroyWebContents();