x11: Move X event handling out of the message-pump.

chrome/browser/extensions/global_shortcut_listener_x11.cc

Index: chrome/browser/extensions/global_shortcut_listener_x11.cc
diff --git a/chrome/browser/extensions/global_shortcut_listener_x11.cc b/chrome/browser/extensions/global_shortcut_listener_x11.cc
index 556bd707a54aa4838c2faa3e0ad9aa61cdb2745c..dd3ed1de80e79a9020051caf0177d4f2fe6b594d 100644
--- a/chrome/browser/extensions/global_shortcut_listener_x11.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_x11.cc
@@ -13,7 +13,7 @@
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdkx.h>
 #else
-#include "base/message_loop/message_pump_x11.h"
+#include "ui/events/platform/x11/x11_event_source.h"
 #endif
 
 using content::BrowserThread;
@@ -77,7 +77,7 @@ void GlobalShortcutListenerX11::StartListening() {
                         &GlobalShortcutListenerX11::OnXEventThunk,
                         this);
 #else
-  base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
+  ui::X11EventSource::GetInstance()->AddPlatformEventDispatcher(this);
 #endif
 
   is_listening_ = true;
@@ -93,18 +93,24 @@ void GlobalShortcutListenerX11::StopListening() {
                            &GlobalShortcutListenerX11::OnXEventThunk,
                            this);
 #else
-  base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
+  ui::X11EventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 #endif
 
   is_listening_ = false;
 }
 
 #if !defined(TOOLKIT_GTK)
-uint32_t GlobalShortcutListenerX11::Dispatch(const base::NativeEvent& event) {
-  if (event->type == KeyPress)
-    OnXKeyPressEvent(event);
+bool GlobalShortcutListenerX11::CanDispatchEvent(
+    const ui::PlatformEvent& event) {
+  return event->type == KeyPress;
+}
+
+uint32_t GlobalShortcutListenerX11::DispatchEvent(
+    const ui::PlatformEvent& event) {
+  CHECK_EQ(KeyPress, event->type);
+  OnXKeyPressEvent(event);
 
-  return POST_DISPATCH_NONE;
+  return ui::POST_DISPATCH_NONE;
 }
 #endif