Chromium Code Reviews| 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)); |