From e4c8344a0d614851954f3001955bfcc01d70b838 Mon Sep 17 00:00:00 2001 From: "davemoore@chromium.org" Date: Fri, 10 Sep 2010 23:43:24 +0000 Subject: Revert 59147 - Allow overriding of X error functions BUG=50006 (and various other reports) TEST=Run chrome under nested window manager using Xephyr (see http://code.google.com/p/chromium/wiki/LayoutTestsLinux) use --enable-logging=stderr --log-level=0 kill xephyr examine log. You should see X IO Error detected followed (not necessarily immediately) by successfully saved /tmp/tx/Default/Preferences successfully saved /tmp/tx/Local State successfully saved /tmp/tx/Local State successfully saved /tmp/tx/Default/Preferences along with no crash. There is a high ranking crash report on both linux and chromeos that happens whenever X sends an error to chrome. This change causes us to log and continue when we get a regular error from X. When we get an IO error, indicating X is gone, we attempt to shut down gracefully. Review URL: http://codereview.chromium.org/3175038 TBR=davemoore@chromium.org Review URL: http://codereview.chromium.org/3332019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59175 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_main.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'chrome/browser/browser_main.cc') diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 7a358be..46d3b0c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -100,7 +100,6 @@ #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) -#include "chrome/browser/browser_main_gtk.h" #include "chrome/browser/gtk/gtk_util.h" #endif @@ -1199,10 +1198,6 @@ int BrowserMain(const MainFunctionParams& parameters) { } #endif -#if defined(USE_X11) - SetBrowserX11ErrorHandlers(); -#endif - Profile* profile = CreateProfile(parameters, user_data_dir); if (!profile) return ResultCodes::NORMAL_EXIT; -- cgit v1.1