MacViews: Modify insertText handlers to correctly handle space key and simplify menu event dispatch.

ui/views/controls/menu/menu_key_event_handler.cc

Index: ui/views/controls/menu/menu_key_event_handler.cc
diff --git a/ui/views/controls/menu/menu_key_event_handler.cc b/ui/views/controls/menu/menu_key_event_handler.cc
index af0566e2af93833c5704f9d2a18d8d0d64df33ba..a0073f903950749bcc759140374d2b976e65c961 100644
--- a/ui/views/controls/menu/menu_key_event_handler.cc
+++ b/ui/views/controls/menu/menu_key_event_handler.cc
@@ -10,12 +10,6 @@
 
 namespace views {
 
-namespace {
-
-const int kKeyFlagsMask = ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN;
-
-}  // namespace
-
 MenuKeyEventHandler::MenuKeyEventHandler() {
   aura::Env::GetInstanceDontCreate()->PrependPreTargetHandler(this);
 }
@@ -27,52 +21,7 @@ MenuKeyEventHandler::~MenuKeyEventHandler() {
 void MenuKeyEventHandler::OnKeyEvent(ui::KeyEvent* event) {
   MenuController* menu_controller = MenuController::GetActiveInstance();
   DCHECK(menu_controller);
-
-  if (menu_controller->exit_type() == MenuController::EXIT_ALL ||
-      menu_controller->exit_type() == MenuController::EXIT_DESTROYED) {
-    // If the event has arrived after the menu's exit type had changed but
-    // before its message loop terminated, the event will continue its normal
-    // propagation for the following reason:
-    // If the user accepts a menu item in a nested menu, the menu item action is
-    // run after the base::RunLoop for the innermost menu has quit but before
-    // the base::RunLoop for the outermost menu has quit. If the menu item
-    // action starts a base::RunLoop, the outermost menu's base::RunLoop will
-    // not quit till the action's base::RunLoop ends. IDC_BOOKMARK_BAR_OPEN_ALL
-    // sometimes opens a modal dialog. The modal dialog starts a base::RunLoop
-    // and keeps the base::RunLoop running for the duration of its lifetime.
-    menu_controller->TerminateNestedMessageLoopIfNecessary();
-    return;
-  }
-
-  event->StopPropagation();
-
-  if (event->type() == ui::ET_KEY_PRESSED) {
-    menu_controller->OnKeyDown(event->key_code());
-    // Menu controller might have been deleted.
-    if (!MenuController::GetActiveInstance())
-      return;
-
-    // Do not check mnemonics if the Alt or Ctrl modifiers are pressed. For
-    // example Ctrl+<T> is an accelerator, but <T> only is a mnemonic.
-    const int flags = event->flags();
-    if (menu_controller->exit_type() == MenuController::EXIT_NONE &&
-        (flags & kKeyFlagsMask) == 0) {
-      base::char16 c = event->GetCharacter();
-      menu_controller->SelectByChar(c);
-      // Menu controller might have been deleted.
-      if (!MenuController::GetActiveInstance())
-        return;
-    }
-  }
-
-  if (!menu_controller->TerminateNestedMessageLoopIfNecessary()) {
-    ui::Accelerator accelerator(*event);
-    ViewsDelegate::ProcessMenuAcceleratorResult result =
-        ViewsDelegate::GetInstance()->ProcessAcceleratorWhileMenuShowing(
-            accelerator);
-    if (result == ViewsDelegate::ProcessMenuAcceleratorResult::CLOSE_MENU)
-      menu_controller->CancelAll();
-  }
+  menu_controller->OnWillDispatchKeyEvent(event);
 }
 
 }  // namespace views