| 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 a8b833a5cddc271dfef240a181589ad181b7e8a1..a88981b3504508b2122bf85f2df9dd5ac996dcc6 100644
|
| --- a/chrome/browser/chrome_browser_main_x11.cc
|
| +++ b/chrome/browser/chrome_browser_main_x11.cc
|
| @@ -96,7 +96,12 @@ int DoUninstallTasks(bool chrome_still_running) {
|
| return content::RESULT_CODE_NORMAL_EXIT;
|
| }
|
|
|
| -void SetBrowserX11ErrorHandlers() {
|
| +void SetBrowserX11ErrorHandlersPreEarlyInitialization() {
|
| + // Use default error handlers during startup.
|
| + ui::SetX11ErrorHandlers(NULL, NULL);
|
| +}
|
| +
|
| +void SetBrowserX11ErrorHandlersPostMainMessageLoopStart() {
|
| // Set up error handlers to make sure profile gets written if X server
|
| // goes away.
|
| ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
|
|
|