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

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

Issue 10909043: Cancel drag if display configuration changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 const AcceleratorData kDebugAcceleratorData[] = { 139 const AcceleratorData kDebugAcceleratorData[] = {
140 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN }, 140 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
141 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 141 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
142 TOGGLE_DESKTOP_BACKGROUND_MODE }, 142 TOGGLE_DESKTOP_BACKGROUND_MODE },
143 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 143 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
144 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI }, 144 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI },
145 // For testing on systems where Alt-Tab is already mapped. 145 // For testing on systems where Alt-Tab is already mapped.
146 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 146 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
147 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 147 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
148 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
149 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
150 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 148 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
151 DISPLAY_TOGGLE_SCALE }, 149 DISPLAY_TOGGLE_SCALE },
152 #if !defined(NDEBUG) 150 #if !defined(NDEBUG)
153 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 151 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
154 PRINT_LAYER_HIERARCHY }, 152 PRINT_LAYER_HIERARCHY },
155 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 153 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
156 PRINT_VIEW_HIERARCHY }, 154 PRINT_VIEW_HIERARCHY },
157 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 155 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
158 PRINT_WINDOW_HIERARCHY }, 156 PRINT_WINDOW_HIERARCHY },
159 #endif 157 #endif
160 }; 158 };
161 159
162 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData); 160 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
163 161
164 const AcceleratorAction kReservedActions[] = { 162 const AcceleratorAction kReservedActions[] = {
165 // Window cycling accelerators. 163 // Window cycling accelerators.
166 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab 164 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab
167 CYCLE_FORWARD_MRU, // Alt+Tab 165 CYCLE_FORWARD_MRU, // Alt+Tab
168 166
169 #if defined(OS_CHROMEOS) 167 #if defined(OS_CHROMEOS)
170 // Chrome OS top-row keys. 168 // Chrome OS top-row keys.
171 FOCUS_PREVIOUS_PANE, // Control+F1 169 FOCUS_PREVIOUS_PANE, // Control+F1
172 FOCUS_NEXT_PANE, // Control+F2 170 FOCUS_NEXT_PANE, // Control+F2
173 CYCLE_DISPLAY_MODE, // Control+F4 171 CYCLE_DISPLAY_MODE, // Control+F4
174 DISPLAY_ADD_REMOVE, // Shift+F4
175 DISPLAY_CYCLE, // Shift+Control+F4
176 CYCLE_FORWARD_LINEAR, // F5 172 CYCLE_FORWARD_LINEAR, // F5
177 CYCLE_BACKWARD_LINEAR, // Shift+F5 173 CYCLE_BACKWARD_LINEAR, // Shift+F5
178 TAKE_SCREENSHOT, // Control+F5 174 TAKE_SCREENSHOT, // Control+F5
179 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5 175 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5
180 BRIGHTNESS_DOWN, // F6 176 BRIGHTNESS_DOWN, // F6
181 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6 177 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6
182 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 178 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
183 BRIGHTNESS_UP, // F7 179 BRIGHTNESS_UP, // F7
184 KEYBOARD_BRIGHTNESS_UP, // Alt+F7 180 KEYBOARD_BRIGHTNESS_UP, // Alt+F7
185 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 181 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 arraysize(kActionsAllowedAtLoginOrLockScreen); 221 arraysize(kActionsAllowedAtLoginOrLockScreen);
226 222
227 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 223 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
228 EXIT, 224 EXIT,
229 }; 225 };
230 226
231 const size_t kActionsAllowedAtLockScreenLength = 227 const size_t kActionsAllowedAtLockScreenLength =
232 arraysize(kActionsAllowedAtLockScreen); 228 arraysize(kActionsAllowedAtLockScreen);
233 229
234 } // namespace ash 230 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698