1 files changed, 29 insertions, 0 deletions
diff --git a/chromium/ui/base/x/x11_error_tracker_gtk.cc b/chromium/ui/base/x/x11_error_tracker_gtk.cc
new file mode 100644
index 00000000000..2806d34b978
--- /dev/null
+++ b/chromium/ui/base/x/x11_error_tracker_gtk.cc
@@ -0,0 +1,29 @@
+// Copyright (c) 2013 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 "ui/base/x/x11_error_tracker.h"
+
+#include <gdk/gdkx.h>
+
+#include "base/logging.h"
+
+namespace ui {
+
+X11ErrorTracker::X11ErrorTracker() {
+  gdk_error_trap_push();
+}
+
+X11ErrorTracker::~X11ErrorTracker() {
+  gdk_error_trap_pop();
+}
+
+bool X11ErrorTracker::FoundNewError() {
+  gdk_flush();
+  bool found_error = gdk_error_trap_pop() != 0;
+
+  gdk_error_trap_push();
+  return found_error;
+}
+
+}  // namespace ui