projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
146ce28
)
Only cancel unresponsive event when window close is cancelled.
author
Cheng Zhao
<zcbenz@gmail.com>
Fri, 9 May 2014 03:40:48 +0000
(11:40 +0800)
committer
Cheng Zhao
<zcbenz@gmail.com>
Fri, 9 May 2014 03:40:48 +0000
(11:40 +0800)
atom/browser/native_window.cc
patch
|
blob
|
history
diff --git
a/atom/browser/native_window.cc
b/atom/browser/native_window.cc
index
e8877ff
..
4e5038f
100644
(file)
--- a/
atom/browser/native_window.cc
+++ b/
atom/browser/native_window.cc
@@
-404,11
+404,12
@@
void NativeWindow::BeforeUnloadFired(content::WebContents* tab,
bool* proceed_to_fire_unload) {
*proceed_to_fire_unload = proceed;
- if (!proceed)
+ if (!proceed)
{
WindowList::WindowCloseCancelled(this);
- // When the "beforeunload" callback is fired the window is certainly live.
- window_unresposive_closure_.Cancel();
+ // Cancel unresponsive event when window close is cancelled.
+ window_unresposive_closure_.Cancel();
+ }
}
void NativeWindow::RequestToLockMouse(content::WebContents* web_contents,