summaryrefslogtreecommitdiffstats
path: root/app/x11_util.h
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 20:06:05 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 20:06:05 +0000
commitc6032e8b0dccde8dc24598e8c93d870b8513a42e (patch)
tree97c064cf68644e68aa81ca2e7eeb73534871e593 /app/x11_util.h
parentee9372cbbc0bbeb8c8f06473409f3749eb443dd2 (diff)
downloadchromium_src-c6032e8b0dccde8dc24598e8c93d870b8513a42e.zip
chromium_src-c6032e8b0dccde8dc24598e8c93d870b8513a42e.tar.gz
chromium_src-c6032e8b0dccde8dc24598e8c93d870b8513a42e.tar.bz2
This is a second attempt of http://codereview.chromium.org/3175038
It failed the Vista Perf UI tests. This is because those tests close the browser upon an error. And they always get an error when the session is closed in the middle of the test. The new changes are in chrome/browser/automation/testing_automation_provider.cc BUG=50006 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. BUG= TEST= Review URL: http://codereview.chromium.org/3364019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/x11_util.h')
-rw-r--r--app/x11_util.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/x11_util.h b/app/x11_util.h
index 8ebed23..c07f42c 100644
--- a/app/x11_util.h
+++ b/app/x11_util.h
@@ -173,8 +173,10 @@ void GrabWindowSnapshot(GtkWindow* gdk_window,
// Change desktop for |window| to the desktop of |destination| window.
bool ChangeWindowDesktop(XID window, XID destination);
-// Sets the X Error Handlers so we can catch X errors and crash.
-void SetX11ErrorHandlers();
+// Enable the default X error handlers. These will log the error and abort
+// the process if called. Use SetX11ErrorHandlers() from x11_util_internal.h
+// to set your own error handlers.
+void SetDefaultX11ErrorHandlers();
} // namespace x11_util