| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 6f36b651ebb6c7ffa0cf6478f2a18ecdbdce85b7..856e4f2a03a70dc7099943ba9d40a1b535b11477 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -708,6 +708,9 @@ DLLEXPORT void __cdecl RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
|
| // content::BrowserMainParts implementation ------------------------------------
|
|
|
| void ChromeBrowserMainParts::PreEarlyInitialization() {
|
| +#if defined(USE_X11)
|
| + SetBrowserX11ErrorHandlersPreEarlyInitialization();
|
| +#endif
|
| TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreEarlyInitialization");
|
| for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
|
| chrome_extra_parts_[i]->PreEarlyInitialization();
|
| @@ -735,6 +738,9 @@ void ChromeBrowserMainParts::PostMainMessageLoopStart() {
|
| TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostMainMessageLoopStart");
|
| for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
|
| chrome_extra_parts_[i]->PostMainMessageLoopStart();
|
| +#if defined(USE_X11)
|
| + SetBrowserX11ErrorHandlersPostMainMessageLoopStart();
|
| +#endif
|
| }
|
|
|
| int ChromeBrowserMainParts::PreCreateThreads() {
|
| @@ -1201,10 +1207,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
|
| }
|
| #endif // !defined(OS_ANDROID)
|
|
|
| -#if defined(USE_X11)
|
| - SetBrowserX11ErrorHandlers();
|
| -#endif
|
| -
|
| // Desktop construction occurs here, (required before profile creation).
|
| PreProfileInit();
|
|
|
|
|