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

Unified Diff: chrome/browser/metrics/thread_watcher.cc

Issue 7782017: In Canary, crash the browser if shutdown takes longer 45 secs (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months 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 | « chrome/browser/browser_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/thread_watcher.cc
===================================================================
--- chrome/browser/metrics/thread_watcher.cc (revision 99853)
+++ chrome/browser/metrics/thread_watcher.cc (working copy)
@@ -734,6 +734,12 @@
} else if (channel == chrome::VersionInfo::CHANNEL_BETA ||
channel == chrome::VersionInfo::CHANNEL_DEV) {
actual_duration *= 25;
+ } else {
+ // In Canary, for Windows XP, give twice the time for shutdown.
+#if defined(OS_WIN)
+ if (base::win::GetVersion() <= base::win::VERSION_XP)
+ actual_duration *= 2;
+#endif
}
shutdown_watchdog_ = new ShutdownWatchDogThread(actual_duration);
shutdown_watchdog_->Arm();
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698