X message pump: Remove the GDK window event filter.

base/message_pump_glib_x.cc

 // Copyright (c) 2011 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 "base/message_pump_glib_x.h"
 
 #include <gdk/gdkx.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #else
@@ skipping 25 matching lines @@
   gdk_window_add_filter(NULL, &GdkEventFilter, this);
   gdk_event_handler_set(&EventDispatcherX, this, NULL);
 
 #if defined(HAVE_XINPUT2)
   InitializeXInput2();
 #endif
   InitializeEventsToCapture();
 }
 
 MessagePumpGlibX::~MessagePumpGlibX() {
+  gdk_window_remove_filter(NULL, &GdkEventFilter, this);
+
+  // It is not necessary to reset the GDK event handler using
+  // gdk_event_handler_set since it's done in the destructor for
+  // MessagePumpForUI.
 }
 
 bool MessagePumpGlibX::ShouldCaptureXEvent(XEvent* xev) {
   return capture_x_events_[xev->type]
 #if defined(HAVE_XINPUT2)
         && (xev->type != GenericEvent || xev->xcookie.extension == xiopcode_)
 #endif
     ;
 }
 
@@ skipping 164 matching lines @@
     return;
   }
 }
 #endif  // HAVE_XINPUT2
 
 bool MessagePumpXObserver::WillProcessXEvent(XEvent* xev) {
   return false;
 }
 
 }  // namespace base