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

Unified Diff: chrome/browser/chrome_browser_main.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
« 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 e8c84605615809c1353900fc9c8c7e5443467314..f619d2a0b93c95e104e29e99be36916df79ab8d8 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1470,6 +1470,14 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() {
// Android specific MessageLoop
NOTREACHED();
#else
+
+#if defined(USE_X11)
+ // Unset the X11 error handlers. The X11 error handlers log the errors using a
+ // |PostTask()| on the message-loop. But since the message-loop is in the
+ // process of terminating, this can cause errors.
+ UnsetBrowserX11ErrorHandlers();
sadrul 2012/09/16 16:32:33 I considered doing this from ChromeBrowserMainPart
+#endif
+
// Start watching for jank during shutdown. It gets disarmed when
// |shutdown_watcher_| object is destructed.
shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300));
« 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