Consolidate win/x dispatchers

BUG=116282
TEST=no functional change. All tests should pass.


Review URL: http://codereview.chromium.org/9958152

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131412 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 26 deletions

diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h
index 7f5cab1..a79fc02 100644
--- a/ui/views/focus/accelerator_handler.h
+++ b/ui/views/focus/accelerator_handler.h
@@ -35,13 +35,10 @@ 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 bool Dispatch(const base::NativeEvent& event) 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:
diff --git a/ui/views/focus/accelerator_handler_aura.cc b/ui/views/focus/accelerator_handler_aura.cc
index 274de1e..8daa0f39 100644
--- a/ui/views/focus/accelerator_handler_aura.cc
+++ b/ui/views/focus/accelerator_handler_aura.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,21 +9,18 @@ namespace views {
 AcceleratorHandler::AcceleratorHandler() {
 }
 
+bool AcceleratorHandler::Dispatch(const base::NativeEvent& event) {
 #if defined(OS_WIN)
-bool AcceleratorHandler::Dispatch(const MSG& msg) {
-  TranslateMessage(&msg);
-  DispatchMessage(&msg);
+  TranslateMessage(&event);
+  DispatchMessage(&event);
+#endif  // defined(OS_WIN)
   return true;
 }
-#else
-base::MessagePumpDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
-    XEvent*) {
-  return base::MessagePumpDispatcher::EVENT_IGNORED;
-}
 
+#if defined(USE_X11)
 bool DispatchXEvent(XEvent* xev) {
   return false;
 }
-#endif  // defined(OS_WIN)
+#endif  // defined(USE_X11)
 
 }  // namespace views
diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc
index 13c3081..a6b3e59 100644
--- a/ui/views/focus/accelerator_handler_win.cc
+++ b/ui/views/focus/accelerator_handler_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -15,9 +15,7 @@ namespace views {
 AcceleratorHandler::AcceleratorHandler() {
 }
 
-bool AcceleratorHandler::Dispatch(const MSG& msg) {
-  bool process_message = true;
-
+bool AcceleratorHandler::Dispatch(const base::NativeEvent& msg) {
   if (msg.message >= WM_KEYFIRST && msg.message <= WM_KEYLAST) {
     Widget* widget = Widget::GetTopLevelWidgetForNativeView(msg.hwnd);
     FocusManager* focus_manager = widget ? widget->GetFocusManager() : NULL;
@@ -26,11 +24,11 @@ bool AcceleratorHandler::Dispatch(const MSG& msg) {
         case WM_KEYDOWN:
         case WM_SYSKEYDOWN: {
           KeyEvent event(msg);
-          process_message = focus_manager->OnKeyEvent(event);
-          if (!process_message) {
+          if (!focus_manager->OnKeyEvent(event)) {
             // Record that this key is pressed so we can remember not to
             // translate and dispatch the associated WM_KEYUP.
             pressed_keys_.insert(msg.wParam);
+            return true;
           }
           break;
         }
@@ -49,11 +47,8 @@ bool AcceleratorHandler::Dispatch(const MSG& msg) {
     }
   }
 
-  if (process_message) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-
+  TranslateMessage(&msg);
+  DispatchMessage(&msg);
   return true;
 }