Enable keyboard accelerators while a menu is open

ui/views/controls/menu/menu_message_pump_dispatcher_win.cc

 // Copyright 2014 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_message_pump_dispatcher_win.h"
 
 #include <windowsx.h>
 
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
@@ skipping 29 matching lines @@
           if (GET_X_LPARAM(msg.lParam) == -1 && GET_Y_LPARAM(msg.lParam) == -1)
             source_type = ui::MENU_SOURCE_KEYBOARD;
           item->GetDelegate()->ShowContextMenu(
               item, item->GetCommand(), screen_loc, source_type);
         }
         should_quit = false;
         should_perform_default = false;
         break;
       }
 
-      // 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 =
-            menu_controller_->OnKeyDown(ui::KeyboardCodeFromNative(msg));
-        TranslateMessage(&msg);
+        // We do nothing here as the key event will be processed by
+        // MenuEventFilter::OnKeyEvent() as a result of the following dispatch
+        // call. The MenuEventFilter will stop the event propagation, so the
+        // focused window will not get the event.
+        //
+        // NOTE: We don't call TranslateMessage() here as we don't want to
+        // produce a WM_CHAR which will result in inserting a character in a
+        // Textfield while the menu is still open or has just exited.
+        // MenuEventFilter::OnKeyEvent() takes care of everything.
+        DispatchMessage(&msg);
         should_perform_default = false;
-        should_quit = !result;
         break;
       }
       case WM_CHAR: {
-        should_quit = menu_controller_->SelectByChar(
-            static_cast<base::char16>(msg.wParam));
+        // We do nothing here. Selecting a menu item by Char is done at the
+        // MenuEventFilter::OnKeyEvent().
         should_perform_default = false;
         break;
       }
       case WM_KEYUP:
       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.
         should_quit = false;
         should_perform_default = false;
@@ skipping 13 matching lines @@
   }
 
   if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE)
     menu_controller_->TerminateNestedMessageLoop();
   return should_perform_default ? POST_DISPATCH_PERFORM_DEFAULT
                                 : POST_DISPATCH_NONE;
 }
 
 }  // namespace internal
 }  // namespace views