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

Unified Diff: ash/common/accelerators/accelerator_controller.cc

Issue 2769213005: Adds kWillProcessAccelerator_KeyEventProperty (Closed)
Patch Set: cleanup Created 3 years, 9 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/common/accelerators/accelerator_controller.cc
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
index 926149fe8c8e414a9fe4d2a4d680dabaf54fce40..eff6d9a0091cd0ee345a99350501857c21316c36 100644
--- a/ash/common/accelerators/accelerator_controller.cc
+++ b/ash/common/accelerators/accelerator_controller.cc
@@ -680,6 +680,13 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
accelerator_manager_->UnregisterAll(target);
}
+bool AcceleratorController::IsActionForAcceleratorEnabled(
+ const ui::Accelerator& accelerator) const {
+ std::map<ui::Accelerator, AcceleratorAction>::const_iterator it =
+ accelerators_.find(accelerator);
+ return it != accelerators_.end() && CanPerformAction(it->second, accelerator);
+}
+
bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
return accelerator_manager_->Process(accelerator);
}
@@ -868,7 +875,7 @@ void AcceleratorController::RegisterDeprecatedAccelerators() {
bool AcceleratorController::CanPerformAction(
AcceleratorAction action,
- const ui::Accelerator& accelerator) {
+ const ui::Accelerator& accelerator) const {
if (accelerator.IsRepeat() && !repeatable_actions_.count(action))
return false;
@@ -1218,7 +1225,7 @@ bool AcceleratorController::ShouldActionConsumeKeyEvent(
}
AcceleratorController::AcceleratorProcessingRestriction
-AcceleratorController::GetAcceleratorProcessingRestriction(int action) {
+AcceleratorController::GetAcceleratorProcessingRestriction(int action) const {
WmShell* wm_shell = WmShell::Get();
if (wm_shell->IsPinned() &&
actions_allowed_in_pinned_mode_.find(action) ==

Powered by Google App Engine
This is Rietveld 408576698