Allow overriding of X error functions

chrome/browser/browser_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 82 matching lines @@
 #include "net/http/http_stream_factory.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/spdy/spdy_session_pool.h"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "base/linux_util.h"
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
+#include "chrome/browser/browser_main_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
 // BrowserMain() as a whole needs to be broken apart so that it's usable by
 // other platforms. For now, it's just a stub. This is a serious work in
@@ skipping 1078 matching lines @@
     // The default profile will have been changed because the ProfileManager
     // will process the notification that the UserManager sends out.
 
     logging::RedirectChromeLogging(
         user_data_dir.Append(profile_manager->GetCurrentProfileDir()),
         *(CommandLine::ForCurrentProcess()),
         logging::DELETE_OLD_LOG_FILE);
   }
 #endif
 
+#if defined(USE_X11)
+  SetBrowserX11ErrorHandlers();
+#endif
+
   Profile* profile = CreateProfile(parameters, user_data_dir);
   if (!profile)
     return ResultCodes::NORMAL_EXIT;
 
   // Post-profile init ---------------------------------------------------------
 
   PrefService* user_prefs = profile->GetPrefs();
   DCHECK(user_prefs);
 
   // Convert active labs into switches. Modifies the current command line.
@@ skipping 310 matching lines @@
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }