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

A normal WebContents can have no owner window

Browse source
This commit is contained in:
Cheng Zhao 2016-05-17 21:50:47 +09:00
parent 118afab67b
commit 8a061b7183
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_web_contents.cc
View file

@ -379,7 +379,7 @@ void WebContents::MoveContents(content::WebContents* source,
void WebContents::CloseContents(content::WebContents* source) { void WebContents::CloseContents(content::WebContents* source) {
Emit("close"); Emit("close");
if (type_ == BROWSER_WINDOW) if (type_ == BROWSER_WINDOW && owner_window())
owner_window()->CloseContents(source); owner_window()->CloseContents(source);
} }
@ -430,13 +430,13 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
void WebContents::RendererUnresponsive(content::WebContents* source) { void WebContents::RendererUnresponsive(content::WebContents* source) {
Emit("unresponsive"); Emit("unresponsive");
if (type_ == BROWSER_WINDOW) if (type_ == BROWSER_WINDOW && owner_window())
owner_window()->RendererUnresponsive(source); owner_window()->RendererUnresponsive(source);
} }
void WebContents::RendererResponsive(content::WebContents* source) { void WebContents::RendererResponsive(content::WebContents* source) {
Emit("responsive"); Emit("responsive");
if (type_ == BROWSER_WINDOW) if (type_ == BROWSER_WINDOW && owner_window())
owner_window()->RendererResponsive(source); owner_window()->RendererResponsive(source);
} }