diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 15:06:13 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 15:06:13 +0000 |
| commit | ad8b926eeb89cf6970b21dd192023674512acb74 (patch) | |
| tree | 27ef2a3f2101b46f4f04ddfa5029093b66c82467 /ash/accelerators/accelerator_table.cc | |
| parent | 2519890e435a80e012e872af211b41aaabdcb412 (diff) | |
| download | chromium_src-ad8b926eeb89cf6970b21dd192023674512acb74.zip chromium_src-ad8b926eeb89cf6970b21dd192023674512acb74.tar.gz chromium_src-ad8b926eeb89cf6970b21dd192023674512acb74.tar.bz2 | |
ash: Clean up window cycling accelerator code
* Eliminate unused CYCLE_BACKWARD_LINEAR action -- linear cycling only goes
forward.
* Consolidate the window cycling code into helper functions
BUG=none
TEST=ash_unittests Accelerator*
Review URL: https://chromiumcodereview.appspot.com/23654011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221430 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, 3 insertions, 8 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 60b102f..bdf23fb 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -37,8 +37,7 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, - { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, - CYCLE_FORWARD_LINEAR }, + { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_LINEAR }, #if defined(OS_CHROMEOS) { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, @@ -103,8 +102,6 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_WINDOW }, - { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, - CYCLE_BACKWARD_LINEAR }, { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, // On Chrome OS, Search key is mapped to LWIN. The Search key binding should @@ -343,10 +340,9 @@ const size_t kActionsAllowedAtModalWindowLength = const AcceleratorAction kNonrepeatableActions[] = { // TODO(mazda): Add other actions which should not be repeated. - CYCLE_BACKWARD_LINEAR, CYCLE_BACKWARD_MRU, - CYCLE_FORWARD_LINEAR, CYCLE_FORWARD_MRU, + CYCLE_LINEAR, EXIT, PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. ROTATE_SCREEN, @@ -365,10 +361,9 @@ const size_t kNonrepeatableActionsLength = const AcceleratorAction kActionsAllowedInAppMode[] = { BRIGHTNESS_DOWN, BRIGHTNESS_UP, - CYCLE_BACKWARD_LINEAR, CYCLE_BACKWARD_MRU, - CYCLE_FORWARD_LINEAR, CYCLE_FORWARD_MRU, + CYCLE_LINEAR, DISABLE_CAPS_LOCK, EXIT, KEYBOARD_BRIGHTNESS_DOWN, |