A bunch of cleanups to beforeunload/unload handling.

1. Remove all the is_closing_browser plumbing. WebContents/TabContents/RenderViewHost/etc really shouldn't (and don't!) need to know anything about whether we're closing the browser or not. 
2. Refactor the handling of beforeunload/unload state in browser.cc. I think this makes it considerably easier to reason about the correctness of it.
3. Added a couple TODOs for future cleanups that would have made this change a bit too large.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/tab_contents_delegate.h b/chrome/browser/tab_contents_delegate.h
index fc2a8c2..2dd077c7d 100644
--- a/chrome/browser/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents_delegate.h
@@ -182,8 +182,14 @@ class TabContentsDelegate : public PageNavigator {
 
   // Tells us that we've finished firing this tab's beforeunload event.
   // The proceed bool tells us whether the user chose to proceed closing the
-  // tab.
-  virtual void BeforeUnloadFired(TabContents* tab, bool proceed) {}
+  // tab. Returns true if the tab can continue on firing it's unload event.
+  // If we're closing the entire browser, then we'll want to delay firing 
+  // unload events until all the beforeunload events have fired.
+  virtual void BeforeUnloadFired(TabContents* tab,
+                                 bool proceed, 
+                                 bool* proceed_to_fire_unload) { 
+    *proceed_to_fire_unload = true;
+  }
 
   // Tells us that we've finished firing this tab's unload event.
   virtual void UnloadFired(TabContents* tab) {}