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

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

Issue 2130603002: ash: Explicitly enumerate repeatable accelerators. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | 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 "ash/strings/grit/ash_strings.h" 7 #include "ash/strings/grit/ash_strings.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 TOGGLE_WIFI, 396 TOGGLE_WIFI,
397 VOLUME_DOWN, 397 VOLUME_DOWN,
398 VOLUME_MUTE, 398 VOLUME_MUTE,
399 VOLUME_UP, 399 VOLUME_UP,
400 #endif 400 #endif
401 }; 401 };
402 402
403 const size_t kActionsAllowedAtModalWindowLength = 403 const size_t kActionsAllowedAtModalWindowLength =
404 arraysize(kActionsAllowedAtModalWindow); 404 arraysize(kActionsAllowedAtModalWindow);
405 405
406 const AcceleratorAction kNonrepeatableActions[] = { 406 const AcceleratorAction kRepeatableActions[] = {
407 // TODO(mazda): Add other actions which should not be repeated. 407 FOCUS_NEXT_PANE,
408 CYCLE_BACKWARD_MRU, 408 FOCUS_PREVIOUS_PANE,
409 CYCLE_FORWARD_MRU, 409 MAGNIFY_SCREEN_ZOOM_IN,
410 EXIT, 410 MAGNIFY_SCREEN_ZOOM_OUT,
411 NEXT_IME, 411 MEDIA_NEXT_TRACK,
412 PREVIOUS_IME, 412 MEDIA_PREV_TRACK,
413 OPEN_FEEDBACK_PAGE, 413 RESTORE_TAB,
414 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down.
415 ROTATE_SCREEN,
416 ROTATE_WINDOW,
417 SCALE_UI_UP,
418 SCALE_UI_DOWN,
419 SCALE_UI_RESET,
420 TAKE_WINDOW_SCREENSHOT,
421 TAKE_PARTIAL_SCREENSHOT,
422 TAKE_SCREENSHOT,
423 TOGGLE_FULLSCREEN,
424 TOGGLE_MAXIMIZED,
425 TOGGLE_OVERVIEW,
426 WINDOW_MINIMIZE,
427 #if defined(OS_CHROMEOS) 414 #if defined(OS_CHROMEOS)
428 DEBUG_TOGGLE_TOUCH_PAD, 415 BRIGHTNESS_DOWN,
429 DEBUG_TOGGLE_TOUCH_SCREEN, 416 BRIGHTNESS_UP,
430 LOCK_SCREEN, 417 KEYBOARD_BRIGHTNESS_DOWN,
431 SUSPEND, 418 KEYBOARD_BRIGHTNESS_UP,
432 #endif 419 VOLUME_DOWN,
420 VOLUME_UP,
421 #endif // defined(OS_CHROMEOS)
433 }; 422 };
434 423
435 const size_t kNonrepeatableActionsLength = arraysize(kNonrepeatableActions); 424 const size_t kRepeatableActionsLength = arraysize(kRepeatableActions);
436 425
437 const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = { 426 const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = {
438 DEBUG_PRINT_LAYER_HIERARCHY, 427 DEBUG_PRINT_LAYER_HIERARCHY,
439 DEBUG_PRINT_VIEW_HIERARCHY, 428 DEBUG_PRINT_VIEW_HIERARCHY,
440 DEBUG_PRINT_WINDOW_HIERARCHY, 429 DEBUG_PRINT_WINDOW_HIERARCHY,
441 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 430 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
442 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 431 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
443 MEDIA_NEXT_TRACK, 432 MEDIA_NEXT_TRACK,
444 MEDIA_PLAY_PAUSE, 433 MEDIA_PLAY_PAUSE,
445 MEDIA_PREV_TRACK, 434 MEDIA_PREV_TRACK,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 TOGGLE_WIFI, 520 TOGGLE_WIFI,
532 VOLUME_DOWN, 521 VOLUME_DOWN,
533 VOLUME_MUTE, 522 VOLUME_MUTE,
534 VOLUME_UP, 523 VOLUME_UP,
535 #endif // defined(OS_CHROMEOS) 524 #endif // defined(OS_CHROMEOS)
536 }; 525 };
537 526
538 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 527 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
539 528
540 } // namespace ash 529 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/accelerators/accelerator_table_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698