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

chrome/browser/extensions/global_shortcut_listener_x11.cc

 // Copyright 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 "chrome/browser/extensions/global_shortcut_listener_x11.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/gfx/x/x11_types.h"
 
 #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;
 
 namespace {
 
 // The modifiers masks used for grabing keys. Due to XGrabKey only working on
 // exact modifiers, we need to grab all key combination including zero or more
 // of the following: Num lock, Caps lock and Scroll lock. So that we can make
 // sure the behavior of global shortcuts is consistent on all platforms.
@@ skipping 43 matching lines @@
 
 void GlobalShortcutListenerX11::StartListening() {
   DCHECK(!is_listening_);  // Don't start twice.
   DCHECK(!registered_hot_keys_.empty());  // Also don't start if no hotkey is
                                           // registered.
 #if defined(TOOLKIT_GTK)
   gdk_window_add_filter(gdk_get_default_root_window(),
                         &GlobalShortcutListenerX11::OnXEventThunk,
                         this);
 #else
-  base::MessagePumpX11::Current()->AddDispatcherForRootWindow(this);
+  ui::X11EventSource::GetInstance()->AddPlatformEventDispatcher(this);
 #endif
 
   is_listening_ = true;
 }
 
 void GlobalShortcutListenerX11::StopListening() {
   DCHECK(is_listening_);  // No point if we are not already listening.
   DCHECK(registered_hot_keys_.empty());  // Make sure the set is clean before
                                          // ending.
 
 #if defined(TOOLKIT_GTK)
   gdk_window_remove_filter(NULL,
                            &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;
+}
 
-  return POST_DISPATCH_NONE;
+uint32_t GlobalShortcutListenerX11::DispatchEvent(
+    const ui::PlatformEvent& event) {
+  CHECK_EQ(KeyPress, event->type);
+  OnXKeyPressEvent(event);
+
+  return ui::POST_DISPATCH_NONE;
 }
 #endif
 
 bool GlobalShortcutListenerX11::RegisterAcceleratorImpl(
     const ui::Accelerator& accelerator) {
   DCHECK(registered_hot_keys_.find(accelerator) == registered_hot_keys_.end());
 
   int modifiers = GetNativeModifiers(accelerator);
   KeyCode keycode = XKeysymToKeycode(x_display_,
       XKeysymForWindowsKeyCode(accelerator.key_code(), false));
@@ skipping 54 matching lines @@
   modifiers |= (x_event->xkey.state & ControlMask) ? ui::EF_CONTROL_DOWN : 0;
   modifiers |= (x_event->xkey.state & Mod1Mask) ? ui::EF_ALT_DOWN : 0;
 
   ui::Accelerator accelerator(
       ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
   if (registered_hot_keys_.find(accelerator) != registered_hot_keys_.end())
     NotifyKeyPressed(accelerator);
 }
 
 }  // namespace extensions