Consolidate win/x dispatchers

ui/views/focus/accelerator_handler.h

 // Copyright (c) 2012 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 UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #define UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 17 matching lines @@
 #if defined(OS_MACOSX)
 class VIEWS_EXPORT AcceleratorHandler {
 #else
 class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
 #endif  // defined(OS_MACOSX)
  public:
   AcceleratorHandler();
 
   // 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 bool 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:
 #if defined(OS_WIN)
   // The keys currently pressed and consumed by the FocusManager.
   std::set<WPARAM> pressed_keys_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_FOCUS_ACCELERATOR_HANDLER_H_