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

Unified Diff: chrome/browser/chrome_browser_main_x11.cc

Issue 10933113: x11: Unset the X11 error handlers when the message-loop starts getting destroyed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
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 bc97bce94475a820cbf7c8af613fabb9385e85bd..acd4c80c788f99688f5fca3e5e2889f21ad8fd0e 100644
--- a/chrome/browser/chrome_browser_main_x11.cc
+++ b/chrome/browser/chrome_browser_main_x11.cc
@@ -67,6 +67,14 @@ int BrowserX11IOErrorHandler(Display* d) {
return 0;
}
+int X11EmptyErrorHandler(Display* d, XErrorEvent* error) {
+ return 0;
+}
+
+int X11EmptyIOErrorHandler(Display* d) {
+ return 0;
+}
+
} // namespace
void RecordBreakpadStatusUMA(MetricsService* metrics) {
@@ -93,3 +101,7 @@ void SetBrowserX11ErrorHandlers() {
// goes away.
ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
}
+
+void UnsetBrowserX11ErrorHandlers() {
+ ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler);
+}
« chrome/browser/chrome_browser_main.cc ('K') | « 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