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

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 12618014: Switch Next Window Key functionality (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: - extra newline Created 7 years, 9 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 unified diff | Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/accelerators/accelerator_table.h" 5 #include "ash/accelerators/accelerator_table.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 18 matching lines...) Expand all
29 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME }, 29 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME },
30 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME }, 30 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME },
31 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME }, 31 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME },
32 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME }, 32 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME },
33 // Shortcut for Koren IME. 33 // Shortcut for Koren IME.
34 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, 34 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
35 35
36 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 36 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 37 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
38 CYCLE_BACKWARD_MRU }, 38 CYCLE_BACKWARD_MRU },
39 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, 39 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_MRU },
James Cook 2013/03/21 16:10:02 These need to be _LINEAR, not _MRU. Otherwise you
40 CYCLE_FORWARD_LINEAR }, 40 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN, CYCLE_BACKWARD_MRU },
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST }, 42 { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI }, 43 { true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI },
44 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, 44 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
45 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, 45 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP },
46 // Maximize button. 46 // Maximize button.
47 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 47 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
48 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY }, 48 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY },
49 // Cycle windows button. 49 // Cycle windows button.
50 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT }, 50 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT },
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB }, 107 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
108 { true, ui::VKEY_BROWSER_BACK, 108 { true, ui::VKEY_BROWSER_BACK,
109 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_UP }, 109 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_UP },
110 { true, ui::VKEY_BROWSER_FORWARD, 110 { true, ui::VKEY_BROWSER_FORWARD,
111 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_DOWN }, 111 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_DOWN },
112 { true, ui::VKEY_BROWSER_REFRESH, 112 { true, ui::VKEY_BROWSER_REFRESH,
113 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, ROTATE_SCREEN }, 113 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, ROTATE_SCREEN },
114 { true, ui::VKEY_BROWSER_REFRESH, 114 { true, ui::VKEY_BROWSER_REFRESH,
115 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 115 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
116 ROTATE_WINDOW }, 116 ROTATE_WINDOW },
117 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN,
118 CYCLE_BACKWARD_LINEAR },
119 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 117 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
120 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 118 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
121 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should 119 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
122 // act on release instead of press when using Search as a modifier key for 120 // act on release instead of press when using Search as a modifier key for
123 // extended keyboard shortcuts. 121 // extended keyboard shortcuts.
124 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 122 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
125 { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK }, 123 { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK },
126 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED }, 124 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED },
127 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE }, 125 { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
128 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, 126 { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 PRINT_LAYER_HIERARCHY, 356 PRINT_LAYER_HIERARCHY,
359 PRINT_VIEW_HIERARCHY, 357 PRINT_VIEW_HIERARCHY,
360 PRINT_WINDOW_HIERARCHY, 358 PRINT_WINDOW_HIERARCHY,
361 #endif 359 #endif
362 }; 360 };
363 361
364 const size_t kActionsAllowedInAppModeLength = 362 const size_t kActionsAllowedInAppModeLength =
365 arraysize(kActionsAllowedInAppMode); 363 arraysize(kActionsAllowedInAppMode);
366 364
367 } // namespace ash 365 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698