Enable keyboard accelerators while a menu is open

chrome/browser/ui/views/chrome_views_delegate.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 "chrome/browser/ui/views/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include <dwmapi.h>
 #include <shellapi.h>
 #include "base/profiler/scoped_tracker.h"
 #include "base/task_runner_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/app_icon_win.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
 #if defined(USE_ASH)
+#include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #endif
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
@@ skipping 54 matching lines @@
   if (MonitorHasTopmostAutohideTaskbarForEdge(ABE_TOP, monitor))
     edges |= views::ViewsDelegate::EDGE_TOP;
   if (MonitorHasTopmostAutohideTaskbarForEdge(ABE_RIGHT, monitor))
     edges |= views::ViewsDelegate::EDGE_RIGHT;
   if (MonitorHasTopmostAutohideTaskbarForEdge(ABE_BOTTOM, monitor))
     edges |= views::ViewsDelegate::EDGE_BOTTOM;
   return edges;
 }
 #endif
 
+void ProcessAcceleratorNow(const ui::Accelerator& accelerator) {
+#if defined(USE_ASH)

[oshima, 2015/09/08 21:43:08]

entire ProcessAcceleratorNow function can be ifdef'ed right?

[afakhry, 2015/09/08 23:34:37]

Done.

+  // TODO(afakhry): See if we need here to send the accelerator to the
+  // FocusManager of the active window in a follow-up CL.
+  ash::Shell::GetInstance()->accelerator_controller()->Process(accelerator);
+#endif  // defined(USE_ASH)
+}
+
 }  // namespace
 
 
 // ChromeViewsDelegate --------------------------------------------------------
 
 #if defined(OS_WIN)
 ChromeViewsDelegate::ChromeViewsDelegate()
     : in_autohide_edges_callback_(false),
       weak_factory_(this) {
 #else
@@ skipping 74 matching lines @@
 }
 
 void ChromeViewsDelegate::NotifyAccessibilityEvent(
     views::View* view, ui::AXEvent event_type) {
 #if defined(USE_AURA)
   AutomationManagerAura::GetInstance()->HandleEvent(
       GetProfileForWindow(view->GetWidget()), view, event_type);
 #endif
 }
 
+void ChromeViewsDelegate::HandleKeyEventOnMenu(ui::KeyEvent* event) {
+#if defined(USE_ASH)
+  views::MenuController* menu_controller =
+      views::MenuController::GetActiveInstance();
+
+  if (!menu_controller)
+    return;
+
+  ui::Accelerator accelerator(*event);
+  ash::AcceleratorController* accelerator_controller =
+      ash::Shell::GetInstance()->accelerator_controller();
+
+  accelerator_controller->accelerator_history()->StoreCurrentAccelerator(
+      accelerator);
+  if (accelerator_controller->ShouldCloseMenuAndRepostAccelerator(
+          accelerator)) {
+    menu_controller->CancelAll();
+    base::MessageLoopForUI::current()->PostTask(
+        FROM_HERE,
+        base::Bind(ProcessAcceleratorNow, accelerator));
+  } else {
+    ProcessAcceleratorNow(accelerator);
+  }
+#endif  // defined(USE_ASH)
+}
+
 #if defined(OS_WIN)
 HICON ChromeViewsDelegate::GetDefaultWindowIcon() const {
   return GetAppIcon();
 }
 
 HICON ChromeViewsDelegate::GetSmallWindowIcon() const {
   return GetSmallAppIcon();
 }
 
 bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
@@ skipping 201 matching lines @@
   return content::BrowserThread::GetBlockingPool();
 }
 
 #if !defined(USE_AURA) && !defined(USE_CHROMEOS)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif