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

Do not send "unresponsive" message if window is showing a modal dialog.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-04 17:18:55 +08:00
parent bfe8928ab1
commit e43b39a009
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
browser/native_window.cc
View file

@ -348,11 +348,12 @@ bool NativeWindow::IsPopupOrPanel(const content::WebContents* source) const {
} }
void NativeWindow::RendererUnresponsive(content::WebContents* source) { void NativeWindow::RendererUnresponsive(content::WebContents* source) {
LOG(ERROR) << "NativeWindow::RendererUnresponsive";
window_unresposive_closure_.Cancel(); window_unresposive_closure_.Cancel();
FOR_EACH_OBSERVER(NativeWindowObserver,
observers_, if (!HasModalDialog())
OnRendererUnresponsive()); FOR_EACH_OBSERVER(NativeWindowObserver,
observers_,
OnRendererUnresponsive());
} }
void NativeWindow::RendererResponsive(content::WebContents* source) { void NativeWindow::RendererResponsive(content::WebContents* source) {