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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_main.cc

Issue 3364019: Allow overriding of X error functions (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« chrome/browser/automation/testing_automation_provider.cc ('K') | « chrome/browser/browser_list.cc ('k') | chrome/browser/browser_main_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 46d3b0cb0e7877d5b7a590fb353b5ead3ea7155b..7a358bee2b2c5a21e33171572d4acce513a3005e 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -100,6 +100,7 @@
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#include "chrome/browser/browser_main_gtk.h"
#include "chrome/browser/gtk/gtk_util.h"
#endif
@@ -1198,6 +1199,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
}
#endif
+#if defined(USE_X11)
+ SetBrowserX11ErrorHandlers();
+#endif
+
Profile* profile = CreateProfile(parameters, user_data_dir);
if (!profile)
return ResultCodes::NORMAL_EXIT;
« chrome/browser/automation/testing_automation_provider.cc ('K') | « chrome/browser/browser_list.cc ('k') | chrome/browser/browser_main_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698