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

Unified Diff: chrome/browser/chrome_browser_main_x11.h

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.cc ('k') | chrome/browser/chrome_browser_main_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_x11.h
diff --git a/chrome/browser/chrome_browser_main_x11.h b/chrome/browser/chrome_browser_main_x11.h
index f3f923aaa98e5726d7cd7e9ca18ed62c47b91b50..5255cd18bc4e2a5cf1d6bb1afb6e2ef12c91713a 100644
--- a/chrome/browser/chrome_browser_main_x11.h
+++ b/chrome/browser/chrome_browser_main_x11.h
@@ -7,9 +7,15 @@
#ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_X11_H_
#define CHROME_BROWSER_CHROME_BROWSER_MAIN_X11_H_
-// Installs the X11 error handlers for the browser process. This will
-// allow us to exit cleanly if X exits before us.
-void SetBrowserX11ErrorHandlers();
+// Installs the X11 error handlers for the browser process used during
+// startup. They simply print error messages and exit because
+// we can't shutdown properly while creating and initializing services.
+void SetBrowserX11ErrorHandlersPreEarlyInitialization();
+
+// Installs the X11 error handlers for the browser process after the
+// main message loop has started. This will allow us to exit cleanly
+// if X exits before us.
+void SetBrowserX11ErrorHandlersPostMainMessageLoopStart();
// Installs empty X11 error handlers. This avoids calling into the message-loop
// in case an X11 erro happens while the message-loop is being destroyed.
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chrome_browser_main_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698