Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7684)

Unified Diff: chrome/browser/ui/browser.h

Issue 11016023: Quickly close tabs/window with long-running unload handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep original TabsNeedBeforeUnloadFired implementation. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/tabs/tab_strip_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 4725cee9db65a3e9623f478bb55302da4b7d2c05..f9a79626e94d669778a40903d630bf1ab503f1f2 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -300,12 +300,19 @@ class Browser : public TabStripModelObserver,
// Gives beforeunload handlers the chance to cancel the close.
bool ShouldCloseWindow();
+ // Figure out if there are tabs that have beforeunload handlers.
+ // It starts beforeunload/unload processing as a side-effect.
+ bool TabsNeedBeforeUnloadFired();
+
bool IsAttemptingToCloseBrowser() const;
// Invoked when the window containing us is closing. Performs the necessary
// cleanup.
void OnWindowClosing();
+ // Called when all unload processing completes so the browser can close.
+ void OnUnloadProcessingCompleted();
+
// OnWindowActivationChanged handling ///////////////////////////////////////
// Invoked when the window containing us is activated.
@@ -460,9 +467,6 @@ class Browser : public TabStripModelObserver,
content::WebContents* source,
const content::NativeWebKeyboardEvent& event) OVERRIDE;
- // Figure out if there are tabs that have beforeunload handlers.
- bool TabsNeedBeforeUnloadFired();
-
bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
bool is_type_popup() const { return type_ == TYPE_POPUP; }
bool is_type_panel() const { return type_ == TYPE_PANEL; }
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/tabs/tab_strip_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698