Don't terminate the process when a tab becomes unresponsive during

unload/beforeunload. Instead, just call close on it. If two tabs are in the
same process, then terminating the process is totally wrong.
This also avoids the bugs where we show sad tab, or don't remove the
tab from the tabstrip.

Also, remove a couple of bogus DCHECKS.

BUG=1314995,1301757

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

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 42018257..35ccb37 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -194,9 +194,6 @@ class Browser : public TabStripModelDelegate,
                          bool proceed, 
                          bool* proceed_to_fire_unload);
 
-  // Tells us that we've finished firing this tab's unload event.
-  void UnloadFired(TabContents* source);
-
   // Invoked when the window containing us is closing. Performs the necessary
   // cleanup.
   void OnWindowClosing();
@@ -548,9 +545,11 @@ class Browser : public TabStripModelDelegate,
   // was in the vector in the first place.
   bool RemoveFromVector(UnloadListenerVector* vector, TabContents* tab);
 
-  // Cleans up state appropriately when we are trying to close the browser
-  // and a tab crashes in it's beforeunload/unload handler.
-  void ClearUnloadStateOnCrash(TabContents* tab);
+  // Cleans up state appropriately when we are trying to close the browser and
+  // the tab has finished firing it's unload handler. We also use this in the 
+  // cases where a tab crashes or hangs even if the beforeunload/unload haven't
+  // successfully fired.
+  void ClearUnloadState(TabContents* tab);
 
   // The frame
   BrowserWindow* window_;