Consolidate win/x dispatchers

ui/views/controls/menu/menu_controller.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 839 matching lines @@
   if (GetActiveInstance() == this) {
     if (showing_) {
       // We're still showing, close all menus.
       CloseAllNestedMenus();
       Cancel(EXIT_ALL);
     }  // else case, drop was on us.
   }  // else case, someone canceled us, don't do anything
 }
 
 #if defined(OS_WIN)
-bool MenuController::Dispatch(const MSG& msg) {
+base::DispatchStatus MenuController::Dispatch(const MSG& msg) {
   DCHECK(blocking_run_);
 
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
     // We must translate/dispatch the message here, otherwise we would drop
     // the message on the floor.
     TranslateMessage(&msg);
     DispatchMessage(&msg);
-    return false;
+    return base::EVENT_QUIT;
   }
 
   // NOTE: we don't get WM_ACTIVATE or anything else interesting in here.
   switch (msg.message) {
     case WM_CONTEXTMENU: {
       MenuItemView* item = pending_state_.item;
       if (item && item->GetRootMenuItem() != item) {
         gfx::Point screen_loc(0, item->height());
         View::ConvertPointToScreen(item, &screen_loc);
         item->GetDelegate()->ShowContextMenu(item, item->GetCommand(),
                                              screen_loc, false);
       }
-      return true;
+      return base::EVENT_PROCESSED;
     }
 
     // NOTE: focus wasn't changed when the menu was shown. As such, don't
     // dispatch key events otherwise the focused window will get the events.
     case WM_KEYDOWN: {
       bool result = OnKeyDown(ui::KeyboardCodeFromNative(msg));
       TranslateMessage(&msg);
-      return result;
+      return result ? base::EVENT_PROCESSED : base::EVENT_QUIT;
     }
     case WM_CHAR:
-      return !SelectByChar(static_cast<char16>(msg.wParam));
-
+      return SelectByChar(static_cast<char16>(msg.wParam)) ?
+          base::EVENT_QUIT : base::EVENT_PROCESSED;
     case WM_KEYUP:
-      return true;
+      return base::EVENT_PROCESSED;
 
     case WM_SYSKEYUP:
       // We may have been shown on a system key, as such don't do anything
       // here. If another system key is pushed we'll get a WM_SYSKEYDOWN and
       // close the menu.
-      return true;
+      return base::EVENT_PROCESSED;
 
     case WM_CANCELMODE:
     case WM_SYSKEYDOWN:
       // Exit immediately on system keys.
       Cancel(EXIT_ALL);
-      return false;
+      return base::EVENT_QUIT;
 
     default:
       break;
   }
   TranslateMessage(&msg);
   DispatchMessage(&msg);
-  return exit_type_ == EXIT_NONE;
+  return exit_type_ != EXIT_NONE ? base::EVENT_QUIT : base::EVENT_PROCESSED;
 }
 #elif defined(USE_WAYLAND)
 base::MessagePumpDispatcher::DispatchStatus
     MenuController::Dispatch(base::wayland::WaylandEvent* ev) {
-  return exit_type_ != EXIT_NONE ?
-      base::MessagePumpDispatcher::EVENT_QUIT :
-      base::MessagePumpDispatcher::EVENT_PROCESSED;
+  return exit_type_ != EXIT_NONE ? base::EVENT_QUIT :base::EVENT_PROCESSED;
 }
 
 #elif defined(USE_AURA)
-base::MessagePumpDispatcher::DispatchStatus
-    MenuController::Dispatch(XEvent* xev) {
+base::DispatchStatus MenuController::Dispatch(const base::NativeEvent& xev) {
+  // XEvent* xev = event;
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
     aura::Env::GetInstance()->GetDispatcher()->Dispatch(xev);
-    return base::MessagePumpDispatcher::EVENT_QUIT;
+    return base::EVENT_QUIT;
   }
   switch (ui::EventTypeFromNative(xev)) {
     case ui::ET_KEY_PRESSED:
       if (!OnKeyDown(ui::KeyboardCodeFromNative(xev)))
-        return base::MessagePumpDispatcher::EVENT_QUIT;
+        return base::EVENT_QUIT;
 
       return SelectByChar(ui::KeyboardCodeFromNative(xev)) ?
-          base::MessagePumpDispatcher::EVENT_QUIT :
-          base::MessagePumpDispatcher::EVENT_PROCESSED;
+          base::EVENT_QUIT : base::EVENT_PROCESSED;
     case ui::ET_KEY_RELEASED:
-      return base::MessagePumpDispatcher::EVENT_PROCESSED;
+      return base::EVENT_PROCESSED;
     default:
       break;
   }
 
-  // TODO(oshima): Update Windows' Dispatcher to return DispatchStatus
-  // instead of bool.
   if (aura::Env::GetInstance()->GetDispatcher()->Dispatch(xev) ==
-      base::MessagePumpDispatcher::EVENT_IGNORED)
-    return EVENT_IGNORED;
-  return exit_type_ != EXIT_NONE ?
-      base::MessagePumpDispatcher::EVENT_QUIT :
-      base::MessagePumpDispatcher::EVENT_PROCESSED;
+      base::EVENT_IGNORED)
+    return base::EVENT_IGNORED;
+  return exit_type_ != EXIT_NONE ? base::EVENT_QUIT : base::EVENT_PROCESSED;
 }
 #endif
 
 bool MenuController::OnKeyDown(ui::KeyboardCode key_code) {
   DCHECK(blocking_run_);
 
   switch (key_code) {
     case ui::VKEY_UP:
       IncrementSelection(-1);
       break;
@@ skipping 1061 matching lines @@
              (!pending_state_.item->HasSubmenu() ||
               !pending_state_.item->GetSubmenu()->IsShowing())) {
     // On exit if the user hasn't selected an item with a submenu, move the
     // selection back to the parent menu item.
     SetSelection(pending_state_.item->GetParentMenuItem(),
                  SELECTION_OPEN_SUBMENU);
   }
 }
 
 }  // namespace views