diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 18:11:48 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 18:11:48 +0000 |
| commit | 22a9e96e4a113611ab6f6e520a5c0484aa5ad843 (patch) | |
| tree | ec67e34ddd205239bdc7965e7a41b389378f7198 /ash/accelerators/accelerator_table.cc | |
| parent | d538c32979f1fd0812753d1b1fe15edc4dcd4bb4 (diff) | |
| download | chromium_src-22a9e96e4a113611ab6f6e520a5c0484aa5ad843.zip chromium_src-22a9e96e4a113611ab6f6e520a5c0484aa5ad843.tar.gz chromium_src-22a9e96e4a113611ab6f6e520a5c0484aa5ad843.tar.bz2 | |
Define the DISABLE_CAPS_LOCK and TOGGLE_CAPS_LOCK accelerators for OS_CHROMEOS only.
These accelerators also fire on Windows ASH while processing the Shift key causing a DCHECK.
BUG=351976
R=sadrul@chromium.org, sky@chromium.org, sadrul
Review URL: https://codereview.chromium.org/198063004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.cc')
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index e9fb112..dcec6d3 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -19,11 +19,6 @@ const AcceleratorData kAcceleratorData[] = { { false, ui::VKEY_LSHIFT, ui::EF_ALT_DOWN, NEXT_IME }, { false, ui::VKEY_SHIFT, ui::EF_ALT_DOWN, NEXT_IME }, { false, ui::VKEY_RSHIFT, ui::EF_ALT_DOWN, NEXT_IME }, - // Single shift release turns off caps lock. - { false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, - { false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, - { false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, - { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME }, { false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME }, // Shortcuts for Japanese IME. @@ -89,6 +84,11 @@ const AcceleratorData kAcceleratorData[] = { // TODO(skuhne): Remove once the test isn't needed anymore. { true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, TOGGLE_TOUCH_VIEW_TESTING }, + // Single shift release turns off caps lock. + { false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, + { false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, + { false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK }, + { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, #endif // defined(OS_CHROMEOS) { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, #if !defined(OS_WIN) @@ -115,7 +115,6 @@ const AcceleratorData kAcceleratorData[] = { // act on release instead of press when using Search as a modifier key for // extended keyboard shortcuts. { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, - { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, |