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

Side by Side Diff: chrome/browser/browser_main.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 2094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 translate_manager->FetchLanguageListFromTranslateServer(user_prefs); 2105 translate_manager->FetchLanguageListFromTranslateServer(user_prefs);
2106 } 2106 }
2107 #endif 2107 #endif
2108 2108
2109 RunUIMessageLoop(browser_process.get()); 2109 RunUIMessageLoop(browser_process.get());
2110 } 2110 }
2111 } 2111 }
2112 2112
2113 // Start watching for jank during shutdown. It gets disarmed when 2113 // Start watching for jank during shutdown. It gets disarmed when
2114 // |shutdown_watcher| object is destructed. 2114 // |shutdown_watcher| object is destructed.
2115 shutdown_watcher.Arm(base::TimeDelta::FromSeconds(25)); 2115 shutdown_watcher.Arm(base::TimeDelta::FromSeconds(45));
2116 2116
2117 #if defined(OS_WIN) 2117 #if defined(OS_WIN)
2118 // If it's the first run, log the search engine chosen. We wait until 2118 // If it's the first run, log the search engine chosen. We wait until
2119 // shutdown because otherwise we can't be sure the user has finished 2119 // shutdown because otherwise we can't be sure the user has finished
2120 // selecting a search engine through the dialog reached from the first run 2120 // selecting a search engine through the dialog reached from the first run
2121 // bubble link. 2121 // bubble link.
2122 if (record_search_engine) { 2122 if (record_search_engine) {
2123 TemplateURLService* url_service = 2123 TemplateURLService* url_service =
2124 TemplateURLServiceFactory::GetForProfile(profile); 2124 TemplateURLServiceFactory::GetForProfile(profile);
2125 const TemplateURL* default_search_engine = 2125 const TemplateURL* default_search_engine =
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2216 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2216 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2217 (pre_read == "0" || pre_read == "1")) { 2217 (pre_read == "0" || pre_read == "1")) {
2218 std::string uma_name(name); 2218 std::string uma_name(name);
2219 uma_name += "_PreRead"; 2219 uma_name += "_PreRead";
2220 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2220 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2221 AddPreReadHistogramTime(uma_name.c_str(), time); 2221 AddPreReadHistogramTime(uma_name.c_str(), time);
2222 } 2222 }
2223 #endif 2223 #endif
2224 #endif 2224 #endif
2225 } 2225 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698