Consolidate win/x dispatchers

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 9588186e979a7ea19079f779581815a4758d662e..3da3c01c6caccb30e01d97c29aeac695ad1dfa80 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -238,16 +238,15 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher {
                                  const LocatedEvent& event);
   void StartDrag(SubmenuView* source, const gfx::Point& location);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_AURA)
   // Dispatcher method. This returns true if the menu was canceled, or
   // if the message is such that the menu should be closed.
-  virtual bool Dispatch(const MSG& msg) OVERRIDE;
+  virtual base::DispatchStatus Dispatch(
+      const base::NativeEvent& event) OVERRIDE;
+  //virtual bool Dispatch(const MSG& msg) OVERRIDE;
 #elif defined(USE_WAYLAND)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
       base::wayland::WaylandEvent* event) OVERRIDE;
-#elif defined(USE_AURA)
-  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
-      XEvent* xevent) OVERRIDE;
 #endif
 
   // Key processing. The return value of this is returned from Dispatch.