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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 17084014: Do not try to shutdown when XIOError happens during startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « no previous file | chrome/browser/chrome_browser_main_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 6f36b651ebb6c7ffa0cf6478f2a18ecdbdce85b7..856e4f2a03a70dc7099943ba9d40a1b535b11477 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -708,6 +708,9 @@ DLLEXPORT void __cdecl RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
// content::BrowserMainParts implementation ------------------------------------
void ChromeBrowserMainParts::PreEarlyInitialization() {
+#if defined(USE_X11)
+ SetBrowserX11ErrorHandlersPreEarlyInitialization();
+#endif
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreEarlyInitialization");
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PreEarlyInitialization();
@@ -735,6 +738,9 @@ void ChromeBrowserMainParts::PostMainMessageLoopStart() {
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostMainMessageLoopStart");
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PostMainMessageLoopStart();
+#if defined(USE_X11)
+ SetBrowserX11ErrorHandlersPostMainMessageLoopStart();
+#endif
}
int ChromeBrowserMainParts::PreCreateThreads() {
@@ -1201,10 +1207,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // !defined(OS_ANDROID)
-#if defined(USE_X11)
- SetBrowserX11ErrorHandlers();
-#endif
-
// Desktop construction occurs here, (required before profile creation).
PreProfileInit();
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698