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( |