1 files changed, 0 insertions, 16 deletions
diff --git a/modules/desktop_capture/linux/x_error_trap.cc b/modules/desktop_capture/linux/x_error_trap.cc
index 53c907fc45..903aa86ab3 100644
--- a/modules/desktop_capture/linux/x_error_trap.cc
+++ b/modules/desktop_capture/linux/x_error_trap.cc
@@ -13,16 +13,10 @@
 #include <assert.h>
 #include <stddef.h>
 
-#if defined(TOOLKIT_GTK)
-#include <gdk/gdk.h>
-#endif  // !defined(TOOLKIT_GTK)
-
 namespace webrtc {
 
 namespace {
 
-#if !defined(TOOLKIT_GTK)
-
 // TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202.
 static bool g_xserver_error_trap_enabled = false;
 static int g_last_xserver_error_code = 0;
@@ -33,32 +27,22 @@ int XServerErrorHandler(Display* display, XErrorEvent* error_event) {
   return 0;
 }
 
-#endif  // !defined(TOOLKIT_GTK)
-
 }  // namespace
 
 XErrorTrap::XErrorTrap(Display* display)
     : original_error_handler_(NULL), enabled_(true) {
-#if defined(TOOLKIT_GTK)
-  gdk_error_trap_push();
-#else   // !defined(TOOLKIT_GTK)
   assert(!g_xserver_error_trap_enabled);
   original_error_handler_ = XSetErrorHandler(&XServerErrorHandler);
   g_xserver_error_trap_enabled = true;
   g_last_xserver_error_code = 0;
-#endif  // !defined(TOOLKIT_GTK)
 }
 
 int XErrorTrap::GetLastErrorAndDisable() {
   enabled_ = false;
-#if defined(TOOLKIT_GTK)
-  return gdk_error_trap_push();
-#else   // !defined(TOOLKIT_GTK)
   assert(g_xserver_error_trap_enabled);
   XSetErrorHandler(original_error_handler_);
   g_xserver_error_trap_enabled = false;
   return g_last_xserver_error_code;
-#endif  // !defined(TOOLKIT_GTK)
 }
 
 XErrorTrap::~XErrorTrap() {