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

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: win fix, adjust test screen size 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 const AcceleratorData kDebugAcceleratorData[] = { 141 const AcceleratorData kDebugAcceleratorData[] = {
142 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN }, 142 { true, ui::VKEY_HOME, ui::EF_CONTROL_DOWN, ROTATE_SCREEN },
143 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 143 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
144 TOGGLE_DESKTOP_BACKGROUND_MODE }, 144 TOGGLE_DESKTOP_BACKGROUND_MODE },
145 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, 145 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
146 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI }, 146 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI },
147 // For testing on systems where Alt-Tab is already mapped. 147 // For testing on systems where Alt-Tab is already mapped.
148 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, 148 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
149 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU }, 149 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
150 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
151 { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
152 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 150 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
153 DISPLAY_TOGGLE_SCALE }, 151 DISPLAY_TOGGLE_SCALE },
154 #if !defined(NDEBUG) 152 #if !defined(NDEBUG)
155 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 153 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
156 PRINT_LAYER_HIERARCHY }, 154 PRINT_LAYER_HIERARCHY },
157 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 155 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
158 PRINT_VIEW_HIERARCHY }, 156 PRINT_VIEW_HIERARCHY },
159 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 157 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
160 PRINT_WINDOW_HIERARCHY }, 158 PRINT_WINDOW_HIERARCHY },
161 #endif 159 #endif
162 }; 160 };
163 161
164 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData); 162 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
165 163
166 const AcceleratorAction kReservedActions[] = { 164 const AcceleratorAction kReservedActions[] = {
167 // Window cycling accelerators. 165 // Window cycling accelerators.
168 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab 166 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab
169 CYCLE_FORWARD_MRU, // Alt+Tab 167 CYCLE_FORWARD_MRU, // Alt+Tab
170 168
171 #if defined(OS_CHROMEOS) 169 #if defined(OS_CHROMEOS)
172 // Chrome OS top-row keys. 170 // Chrome OS top-row keys.
173 FOCUS_PREVIOUS_PANE, // Control+F1 171 FOCUS_PREVIOUS_PANE, // Control+F1
174 FOCUS_NEXT_PANE, // Control+F2 172 FOCUS_NEXT_PANE, // Control+F2
175 CYCLE_DISPLAY_MODE, // Control+F4 173 CYCLE_DISPLAY_MODE, // Control+F4
176 DISPLAY_ADD_REMOVE, // Shift+F4
177 DISPLAY_CYCLE, // Shift+Control+F4
178 CYCLE_FORWARD_LINEAR, // F5 174 CYCLE_FORWARD_LINEAR, // F5
179 CYCLE_BACKWARD_LINEAR, // Shift+F5 175 CYCLE_BACKWARD_LINEAR, // Shift+F5
180 TAKE_SCREENSHOT, // Control+F5 176 TAKE_SCREENSHOT, // Control+F5
181 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5 177 TAKE_PARTIAL_SCREENSHOT, // Shift+Control+F5
182 BRIGHTNESS_DOWN, // F6 178 BRIGHTNESS_DOWN, // F6
183 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6 179 KEYBOARD_BRIGHTNESS_DOWN, // Alt+F6
184 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 180 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
185 BRIGHTNESS_UP, // F7 181 BRIGHTNESS_UP, // F7
186 KEYBOARD_BRIGHTNESS_UP, // Alt+F7 182 KEYBOARD_BRIGHTNESS_UP, // Alt+F7
187 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 183 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 arraysize(kActionsAllowedAtLoginOrLockScreen); 225 arraysize(kActionsAllowedAtLoginOrLockScreen);
230 226
231 const AcceleratorAction kActionsAllowedAtLockScreen[] = { 227 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
232 EXIT, 228 EXIT,
233 }; 229 };
234 230
235 const size_t kActionsAllowedAtLockScreenLength = 231 const size_t kActionsAllowedAtLockScreenLength =
236 arraysize(kActionsAllowedAtLockScreen); 232 arraysize(kActionsAllowedAtLockScreen);
237 233
238 } // namespace ash 234 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698