diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:20:07 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-18 09:20:07 +0000 |
| commit | 97388a1838eb65cf984bf0a105f8719b475c1ffa (patch) | |
| tree | 569d73f094accba928d88420add12ab6c04472c9 /ash/accelerators/accelerator_controller.cc | |
| parent | 370eaf1049617e245613f52610848d786bff1b84 (diff) | |
| download | chromium_src-97388a1838eb65cf984bf0a105f8719b475c1ffa.zip chromium_src-97388a1838eb65cf984bf0a105f8719b475c1ffa.tar.gz chromium_src-97388a1838eb65cf984bf0a105f8719b475c1ffa.tar.bz2 | |
Reserve Debug Shortcuts
- Processes debug shortcuts earlier in input cycle to prevent some views from blocking them.
BUG=157650
Review URL: https://chromiumcodereview.appspot.com/14845014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 175c79d..677e8a4 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -400,8 +400,11 @@ void AcceleratorController::Init() { RegisterAccelerators(kDesktopAcceleratorData, kDesktopAcceleratorDataLength); #endif - if (DebugShortcutsEnabled()) + if (DebugShortcutsEnabled()) { RegisterAccelerators(kDebugAcceleratorData, kDebugAcceleratorDataLength); + for (size_t i = 0; i < kReservedDebugActionsLength; ++i) + reserved_actions_.insert(kReservedDebugActions[i]); + } #if defined(OS_CHROMEOS) keyboard_brightness_control_delegate_.reset( |