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

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

Issue 2323863002: Separate debugging and developer accelerators (Closed)
Patch Set: Nits Created 4 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/common/accelerators/accelerator_controller.cc
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
index c7c4e6e2fa99a199b51877aafa73a41dd9e4c092..080315a496d03c481ef131ff4f91fb6f7348b9c6 100644
--- a/ash/common/accelerators/accelerator_controller.cc
+++ b/ash/common/accelerators/accelerator_controller.cc
@@ -686,6 +686,14 @@ void AcceleratorController::Init() {
for (size_t i = 0; i < kDebugAcceleratorDataLength; ++i)
reserved_actions_.insert(kDebugAcceleratorData[i].action);
}
+
+ if (debug::DeveloperAcceleratorsEnabled()) {
+ RegisterAccelerators(kDeveloperAcceleratorData,
+ kDeveloperAcceleratorDataLength);
+ // Developer accelerators are also reserved.
+ for (size_t i = 0; i < kDeveloperAcceleratorDataLength; ++i)
+ reserved_actions_.insert(kDeveloperAcceleratorData[i].action);
+ }
}
void AcceleratorController::RegisterAccelerators(

Powered by Google App Engine
This is Rietveld 408576698