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

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

Issue 10825002: Separate debug shortcuts into another array in ash accelerator table. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.h ('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 #include "ui/base/events.h" 8 #include "ui/base/events.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 19 matching lines...) Expand all
30 #endif 30 #endif
31 { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME }, 31 { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME },
32 // Shortcuts for Japanese IME. 32 // Shortcuts for Japanese IME.
33 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME }, 33 { true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME },
34 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME }, 34 { true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME },
35 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME }, 35 { true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME },
36 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME }, 36 { true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME },
37 // Shortcut for Koren IME. 37 // Shortcut for Koren IME.
38 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME }, 38 { true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME },
39 39
40 { true, ui::VKEY_TAB, 40 { true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
41 ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
42 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 41 { true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
43 CYCLE_BACKWARD_MRU }, 42 CYCLE_BACKWARD_MRU },
44 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 43 { true, ui::VKEY_F5, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
45 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR }, 44 { true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, CYCLE_FORWARD_LINEAR },
46 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
47 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN }, 46 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN },
48 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP }, 47 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP },
49 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN }, 48 { true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN },
50 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP }, 49 { true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP },
51 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE }, 50 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN, CYCLE_DISPLAY_MODE },
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // Window management shortcuts. 114 // Window management shortcuts.
116 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT }, 115 { true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_SNAP_LEFT },
117 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT }, 116 { true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_SNAP_RIGHT },
118 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE }, 117 { true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE },
119 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, WINDOW_MAXIMIZE_RESTORE }, 118 { true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, WINDOW_MAXIMIZE_RESTORE },
120 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 119 { true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
121 WINDOW_POSITION_CENTER }, 120 WINDOW_POSITION_CENTER },
122 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE }, 121 { true, ui::VKEY_F2, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE },
123 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE }, 122 { true, ui::VKEY_F1, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE },
124 123
124 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and
125 // VKEY_MEDIA_LAUNCH_MAIL.
126 };
127
128 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
129
130 const AcceleratorData kDebugAcceleratorData[] = {
125 { true, ui::VKEY_F3, 131 { true, ui::VKEY_F3,
126 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 132 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
127 ROTATE_WINDOWS }, 133 ROTATE_WINDOWS },
128 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN }, 134 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
129 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 135 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
130 TOGGLE_DESKTOP_BACKGROUND_MODE }, 136 TOGGLE_DESKTOP_BACKGROUND_MODE },
131 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 137 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
132 // For testing on systems where Alt-Tab is already mapped. 138 // For testing on systems where Alt-Tab is already mapped.
133 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 139 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
134 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 140 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
135 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE }, 141 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
136 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE }, 142 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
137 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 143 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
138 DISPLAY_TOGGLE_SCALE }, 144 DISPLAY_TOGGLE_SCALE },
139 #if !defined(NDEBUG) 145 #if !defined(NDEBUG)
140 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 146 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
141 PRINT_LAYER_HIERARCHY }, 147 PRINT_LAYER_HIERARCHY },
142 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 148 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
143 PRINT_VIEW_HIERARCHY }, 149 PRINT_VIEW_HIERARCHY },
144 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 150 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
145 PRINT_WINDOW_HIERARCHY }, 151 PRINT_WINDOW_HIERARCHY },
146 #endif 152 #endif
147
148 // TODO(yusukes): Handle VKEY_MEDIA_STOP, VKEY_MEDIA_PLAY_PAUSE, and
149 // VKEY_MEDIA_LAUNCH_MAIL.
150 }; 153 };
151 154
152 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); 155 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
153 156
154 const AcceleratorAction kReservedActions[] = { 157 const AcceleratorAction kReservedActions[] = {
155 // Window cycling accelerators. 158 // Window cycling accelerators.
156 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab 159 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab
157 CYCLE_FORWARD_MRU, // Alt+Tab 160 CYCLE_FORWARD_MRU, // Alt+Tab
158 161
159 #if defined(OS_CHROMEOS) 162 #if defined(OS_CHROMEOS)
160 // Chrome OS top-row keys. 163 // Chrome OS top-row keys.
161 FOCUS_PREVIOUS_PANE, // Control+F1 164 FOCUS_PREVIOUS_PANE, // Control+F1
162 FOCUS_NEXT_PANE, // Control+F2 165 FOCUS_NEXT_PANE, // Control+F2
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 arraysize(kActionsAllowedAtLoginOrLockScreen); 216 arraysize(kActionsAllowedAtLoginOrLockScreen);
214 217
215 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 218 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
216 EXIT, 219 EXIT,
217 }; 220 };
218 221
219 const size_t kActionsAllowedAtLockScreenLength = 222 const size_t kActionsAllowedAtLockScreenLength =
220 arraysize(kActionsAllowedAtLockScreen); 223 arraysize(kActionsAllowedAtLockScreen);
221 224
222 } // namespace ash 225 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698