Fixes issue with accelerators when a menu is open

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"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/view_constants.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
+#include "ui/aura/client/accelerator_client.h"
 #include "ui/aura/root_window.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using ui::OSExchangeData;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
 
 // Delay, in ms, between when menus are selected are moused over and the menu
 // appears.
 static const int kShowDelay = 400;
 
 // Amount of time from when the drop exits the menu and the menu is hidden.
 static const int kCloseOnExitTime = 1200;
 
 // Amount to inset submenus.
 static const int kSubmenuHorizontalInset = 3;
 
 namespace views {
 
 namespace {
 
+const int kModifierMask = (ui::EF_SHIFT_DOWN |
+                           ui::EF_CONTROL_DOWN |
+                           ui::EF_ALT_DOWN);
+
 // Returns true if the mnemonic of |menu| matches key.
 bool MatchesMnemonic(MenuItemView* menu, char16 key) {
   return menu->GetMnemonic() == key;
 }
 
 // Returns true if |menu| doesn't have a mnemonic and first character of the its
 // title is |key|.
 bool TitleMatchesMnemonic(MenuItemView* menu, char16 key) {
   if (menu->GetMnemonic())
     return false;
@@ skipping 792 matching lines @@
       return true;
     }
 
     // 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;
     }
-    case WM_CHAR:
+    case WM_CHAR: {
+#if defined(USE_AURA)
+      ui::Accelerator accelerator(ui::KeyboardCodeFromNative(msg),
+          ui::EventFlagsFromNative(msg) & kModifierMask);
+      if (aura::client::GetAcceleratorClient() &&
+          aura::client::GetAcceleratorClient()->Process(accelerator))
+        return false;
+#endif
       return !SelectByChar(static_cast<char16>(msg.wParam));
+    }
 
     case WM_KEYUP:
       return true;
 
     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;
 
@@ skipping 18 matching lines @@
       base::MessagePumpDispatcher::EVENT_PROCESSED;
 }
 
 #elif defined(USE_AURA)
 base::MessagePumpDispatcher::DispatchStatus
     MenuController::Dispatch(XEvent* xev) {
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
     aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev);
     return base::MessagePumpDispatcher::EVENT_QUIT;
   }
+
+  ui::KeyboardCode keycode = ui::KeyboardCodeFromNative(xev);
   switch (ui::EventTypeFromNative(xev)) {
-    case ui::ET_KEY_PRESSED:
-      if (!OnKeyDown(ui::KeyboardCodeFromNative(xev)))
-        return base::MessagePumpDispatcher::EVENT_QUIT;
-
+    case ui::ET_KEY_PRESSED: {
+        if (!OnKeyDown(keycode))
+          return base::MessagePumpDispatcher::EVENT_QUIT;
       // OnKeyDown may have set exit_type_.
       // TODO(sky): This shouldn't be necessary if OnKeyDown returns correct
       // value for space key on edit menu. Fix OnKeyDown and remove this.
       // See crbug.com/107919.
       if (exit_type_ != EXIT_NONE)
         return base::MessagePumpDispatcher::EVENT_QUIT;
 
-      return SelectByChar(ui::KeyboardCodeFromNative(xev)) ?
-          base::MessagePumpDispatcher::EVENT_QUIT :
-          base::MessagePumpDispatcher::EVENT_PROCESSED;
+      ui::Accelerator accelerator(keycode,
+          ui::EventFlagsFromNative(xev) & kModifierMask);
+      if (aura::client::GetAcceleratorClient() &&
+          aura::client::GetAcceleratorClient()->Process(accelerator))
+        return base::MessagePumpDispatcher::EVENT_QUIT;
+
+      if (SelectByChar(keycode))
+        return base::MessagePumpDispatcher::EVENT_QUIT;
+
+      return base::MessagePumpDispatcher::EVENT_PROCESSED;

[oshima, 2012/01/27 21:41:34]

I think WM accelerator should be handled before chrome process event. once you
change to use base::NativeEvent, you can simply call

if (accelerator_client && accelerator_client->Process(event))
  return EVENT_PROCESSED;

at the beginning of Dispatch.

+    }
     case ui::ET_KEY_RELEASED:
       return base::MessagePumpDispatcher::EVENT_PROCESSED;
     default:
       break;
   }
 
   // TODO(oshima): Update Windows' Dispatcher to return DispatchStatus
   // instead of bool.
   if (aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev) ==
       base::MessagePumpDispatcher::EVENT_IGNORED)
@@ skipping 1089 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