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

Unified Diff: chrome/browser/chrome_browser_main_x11.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 | « chrome/browser/chrome_browser_main_x11.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_x11.cc
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc
index a8b833a5cddc271dfef240a181589ad181b7e8a1..a88981b3504508b2122bf85f2df9dd5ac996dcc6 100644
--- a/chrome/browser/chrome_browser_main_x11.cc
+++ b/chrome/browser/chrome_browser_main_x11.cc
@@ -96,7 +96,12 @@ int DoUninstallTasks(bool chrome_still_running) {
return content::RESULT_CODE_NORMAL_EXIT;
}
-void SetBrowserX11ErrorHandlers() {
+void SetBrowserX11ErrorHandlersPreEarlyInitialization() {
+ // Use default error handlers during startup.
+ ui::SetX11ErrorHandlers(NULL, NULL);
+}
+
+void SetBrowserX11ErrorHandlersPostMainMessageLoopStart() {
// Set up error handlers to make sure profile gets written if X server
// goes away.
ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
« no previous file with comments | « chrome/browser/chrome_browser_main_x11.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698