diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 22:34:16 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-09 22:34:16 +0000 |
| commit | ed732209f6a47ea91abebb574c39ba10b960b67a (patch) | |
| tree | 0fc39829dc86b0abff0f4515869e31e4165d63bd | |
| parent | 70b39de5c8c4ba73794316784c75348d6bd19bbf (diff) | |
| download | chromium_src-ed732209f6a47ea91abebb574c39ba10b960b67a.zip chromium_src-ed732209f6a47ea91abebb574c39ba10b960b67a.tar.gz chromium_src-ed732209f6a47ea91abebb574c39ba10b960b67a.tar.bz2 | |
Merge 100363 - Crash browser if shutdown takes longer
than 90 secs.
BUG=95506
TEST=shutdown
R=eroman
Review URL: http://codereview.chromium.org/7841061
TBR=rtenneti@chromium.org
Review URL: http://codereview.chromium.org/7863012
git-svn-id: svn://svn.chromium.org/chrome/branches/874/src@100518 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index b9e071d..5990187 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1847,7 +1847,7 @@ int ChromeBrowserMainParts::TemporaryContinue() { // Start watching for jank during shutdown. It gets disarmed when // |shutdown_watcher_| object is destructed. - shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(45)); + shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(90)); #if defined(OS_WIN) // If it's the first run, log the search engine chosen. We wait until |