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

ui/views/controls/menu/menu_controller.h

Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index cab7baedaae315cefc04e977a0f61ad77a382ab3..9d5fec174a59d1236c0e03d4c5333e8288d94f2c 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "ui/events/event_constants.h"
+#include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/widget/widget_observer.h"
@@ -28,6 +29,7 @@ class Screen;
 namespace ui {
 class NativeTheme;
 class OSExchangeData;
+class ScopedEventDispatcher;
 }
 namespace views {
 
@@ -39,6 +41,7 @@ class View;
 
 namespace internal {
 class MenuControllerDelegate;
+class MenuEventDispatcher;
 class MenuMessagePumpDispatcher;
 class MenuRunnerImpl;
 }
@@ -142,6 +145,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
+  friend class internal::MenuEventDispatcher;
   friend class internal::MenuMessagePumpDispatcher;
   friend class internal::MenuRunnerImpl;
   friend class MenuHostRootView;
@@ -475,6 +479,12 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   void HandleMouseLocation(SubmenuView* source,
                            const gfx::Point& mouse_location);
 
+#if 0
+  // PlatformEventDispatcher:
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+#endif
+
   // Retrieve an appropriate Screen.
   gfx::Screen* GetScreen();
 
@@ -588,6 +598,8 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   // Set to true if the menu item was selected by touch.
   bool item_selected_by_touch_;
 
+  scoped_ptr<ui::ScopedEventDispatcher> nested_dispatcher_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };