Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1686)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 1138523006: Enable keyboard accelerators while a menu is open (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename the enum values Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 033f7149bbcf750bca90a077615c4f6151002758..3ccbb33665a9ff7f2a77cf843006367ff509491c 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -787,6 +787,16 @@ void AcceleratorController::SetScreenshotDelegate(
screenshot_delegate_ = screenshot_delegate.Pass();
}
+bool AcceleratorController::ShouldCloseMenuAndRepostAccelerator(
+ const ui::Accelerator& accelerator) const {
+ auto itr = accelerators_.find(accelerator);
+ if (itr == accelerators_.end())
+ return false; // Menu shouldn't be closed for an invalid accelerator.
+
+ AcceleratorAction action = itr->second;
+ return actions_keeping_menu_open_.count(action) == 0;
+}
+
////////////////////////////////////////////////////////////////////////////////
// AcceleratorController, ui::AcceleratorTarget implementation:
@@ -831,6 +841,8 @@ void AcceleratorController::Init() {
actions_allowed_in_app_mode_.insert(kActionsAllowedInAppMode[i]);
for (size_t i = 0; i < kActionsNeedingWindowLength; ++i)
actions_needing_window_.insert(kActionsNeedingWindow[i]);
+ for (size_t i = 0; i < kActionsKeepingMenuOpenLength; ++i)
+ actions_keeping_menu_open_.insert(kActionsKeepingMenuOpen[i]);
RegisterAccelerators(kAcceleratorData, kAcceleratorDataLength);

Powered by Google App Engine
This is Rietveld 408576698