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

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

Issue 582143004: Introduce "Preferred" accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 { true, ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 224 { true, ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
225 DEBUG_TOGGLE_SHOW_DEBUG_BORDERS }, 225 DEBUG_TOGGLE_SHOW_DEBUG_BORDERS },
226 { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 226 { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
227 DEBUG_TOGGLE_SHOW_FPS_COUNTER }, 227 DEBUG_TOGGLE_SHOW_FPS_COUNTER },
228 { true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 228 { true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
229 DEBUG_TOGGLE_SHOW_PAINT_RECTS }, 229 DEBUG_TOGGLE_SHOW_PAINT_RECTS },
230 }; 230 };
231 231
232 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData); 232 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
233 233
234 const AcceleratorAction kReservedActions[] = { 234 const AcceleratorAction kPreferredActions[] = {
235 // Window cycling accelerators. 235 // Window cycling accelerators.
236 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab 236 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab
237 CYCLE_FORWARD_MRU, // Alt+Tab 237 CYCLE_FORWARD_MRU, // Alt+Tab
238 };
239
240 const size_t kPreferredActionsLength = arraysize(kPreferredActions);
241
242 const AcceleratorAction kReservedActions[] = {
238 #if defined(OS_CHROMEOS) 243 #if defined(OS_CHROMEOS)
239 POWER_PRESSED, 244 POWER_PRESSED,
240 POWER_RELEASED, 245 POWER_RELEASED,
246 #else
247 DUMMY_FOR_RESERVED,
241 #endif 248 #endif
242 }; 249 };
243 250
244 const size_t kReservedActionsLength = arraysize(kReservedActions); 251 const size_t kReservedActionsLength = arraysize(kReservedActions);
245 252
246 const AcceleratorAction kReservedDebugActions[] = { 253 const AcceleratorAction kReservedDebugActions[] = {
247 PRINT_LAYER_HIERARCHY, 254 PRINT_LAYER_HIERARCHY,
248 PRINT_VIEW_HIERARCHY, 255 PRINT_VIEW_HIERARCHY,
249 PRINT_WINDOW_HIERARCHY, 256 PRINT_WINDOW_HIERARCHY,
250 DEBUG_TOGGLE_DEVICE_SCALE_FACTOR, 257 DEBUG_TOGGLE_DEVICE_SCALE_FACTOR,
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 WINDOW_MINIMIZE, 428 WINDOW_MINIMIZE,
422 TOGGLE_FULLSCREEN, 429 TOGGLE_FULLSCREEN,
423 TOGGLE_MAXIMIZED, 430 TOGGLE_MAXIMIZED,
424 WINDOW_POSITION_CENTER, 431 WINDOW_POSITION_CENTER,
425 ROTATE_WINDOW, 432 ROTATE_WINDOW,
426 }; 433 };
427 434
428 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow); 435 const size_t kActionsNeedingWindowLength = arraysize(kActionsNeedingWindow);
429 436
430 } // namespace ash 437 } // namespace ash
OLDNEW
« ash/accelerators/accelerator_table.h ('K') | « ash/accelerators/accelerator_table.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698