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

chrome/browser/extensions/global_shortcut_listener_x11.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
 #define CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_
 
 #include <X11/Xlib.h>
 #include <set>
 
-#include "base/message_loop/message_pump_dispatcher.h"
 #include "chrome/browser/extensions/global_shortcut_listener.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #include "ui/base/gtk/gtk_signal.h"
+#else
+#include "ui/events/platform/platform_event_dispatcher.h"
 #endif  // defined(TOOLKIT_GTK)
 
 namespace extensions {
 
 // X11-specific implementation of the GlobalShortcutListener class that
 // listens for global shortcuts. Handles basic keyboard intercepting and
 // forwards its output to the base class for processing.
-class GlobalShortcutListenerX11
-    :
+class GlobalShortcutListenerX11 : public GlobalShortcutListener
 #if !defined(TOOLKIT_GTK)
-      public base::MessagePumpDispatcher,
+                                  ,
+                                  public ui::PlatformEventDispatcher
 #endif
-      public GlobalShortcutListener {
+                                  {
  public:
   GlobalShortcutListenerX11();
   virtual ~GlobalShortcutListenerX11();
 
 #if !defined(TOOLKIT_GTK)
-  // base::MessagePumpDispatcher implementation.
-  virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
+  // ui::PlatformEventDispatcher implementation.
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
 #endif
 
  private:
   // GlobalShortcutListener implementation.
   virtual void StartListening() OVERRIDE;
   virtual void StopListening() OVERRIDE;
   virtual bool RegisterAcceleratorImpl(
       const ui::Accelerator& accelerator) OVERRIDE;
   virtual void UnregisterAcceleratorImpl(
       const ui::Accelerator& accelerator) OVERRIDE;
@@ skipping 17 matching lines @@
   // A set of registered accelerators.
   typedef std::set<ui::Accelerator> RegisteredHotKeys;
   RegisteredHotKeys registered_hot_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerX11);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_GLOBAL_SHORTCUT_LISTENER_X11_H_