Consolidate win/x dispatchers

ui/views/focus/accelerator_handler.h

Index: ui/views/focus/accelerator_handler.h
diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h
index 7897294752cc6dc04c542701ad9d0569c124585f..fe593f89fb8187173c0ba4ad19b64203ad0f2706 100644
--- a/ui/views/focus/accelerator_handler.h
+++ b/ui/views/focus/accelerator_handler.h
@@ -35,16 +35,14 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
 
   // Dispatcher method. This returns true if an accelerator was processed by the
   // focus manager
-#if defined(OS_WIN)
-  virtual bool Dispatch(const MSG& msg) OVERRIDE;
+#if defined(OS_WIN) || defined(USE_AURA)
+  virtual base::DispatchStatus Dispatch(
+      const base::NativeEvent& event) OVERRIDE;
 #elif defined(USE_WAYLAND)
   virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
       base::wayland::WaylandEvent* ev) OVERRIDE;
 #elif defined(OS_MACOSX)
   // TODO(dhollowa): Implement on Mac.  http://crbug.com/109946
-#elif defined(USE_AURA)
-  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
-      XEvent* xev) OVERRIDE;
 #endif
 
  private: