diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 23:32:47 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-29 23:32:47 +0000 |
| commit | c82192d62ae8518837f448f9bbd9d0c93cd4af13 (patch) | |
| tree | 795361f6bb6033caf55862386541c70e08b969be /chrome/browser/browser.h | |
| parent | 9a2bba4ed0996b8bc9f8dab235ad83af3f155948 (diff) | |
| download | chromium_src-c82192d62ae8518837f448f9bbd9d0c93cd4af13.zip chromium_src-c82192d62ae8518837f448f9bbd9d0c93cd4af13.tar.gz chromium_src-c82192d62ae8518837f448f9bbd9d0c93cd4af13.tar.bz2 | |
Fix not closing the browser with hung, crashed and interstitial tabs. Adds a 1 second hang monitor for the beforeunload/unload events to fire.
BUG=1296059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index aaf892b..58d6324 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -517,11 +517,15 @@ class Browser : public TabStripModelDelegate, // Processes the next tab that needs it's beforeunload event fired before // we can proceed with closing the browser. - void Browser::ProcessPendingBeforeUnloadTabs(); + void ProcessPendingBeforeUnloadTabs(); // Processes the next tab that needs it's unload event fired before we can // proceed with closing the browser. - void Browser::ProcessPendingUnloadTabs(); + void ProcessPendingUnloadTabs(); + + // 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); // The frame ChromeFrame* frame_; @@ -580,7 +584,7 @@ class Browser : public TabStripModelDelegate, ScopedRunnableMethodFactory<Browser> chrome_updater_factory_; // The following factory is used to close the frame at a later time. - ScopedRunnableMethodFactory<Browser> frame_method_factory_; + ScopedRunnableMethodFactory<Browser> method_factory_; // This object is used to perform periodic actions in a worker // thread. It is currently used to monitor hung plugin windows. |