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

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

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 6 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/ash.gyp » ('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 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 DEBUG_TOGGLE_TOUCH_PAD, 457 DEBUG_TOGGLE_TOUCH_PAD,
458 DEBUG_TOGGLE_TOUCH_SCREEN, 458 DEBUG_TOGGLE_TOUCH_SCREEN,
459 LOCK_SCREEN, 459 LOCK_SCREEN,
460 SUSPEND, 460 SUSPEND,
461 #endif 461 #endif
462 }; 462 };
463 463
464 const size_t kNonrepeatableActionsLength = 464 const size_t kNonrepeatableActionsLength =
465 arraysize(kNonrepeatableActions); 465 arraysize(kNonrepeatableActions);
466 466
467 const AcceleratorAction kActionsAllowedInAppMode[] = { 467 const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = {
468 DEBUG_PRINT_LAYER_HIERARCHY, 468 DEBUG_PRINT_LAYER_HIERARCHY,
469 DEBUG_PRINT_VIEW_HIERARCHY, 469 DEBUG_PRINT_VIEW_HIERARCHY,
470 DEBUG_PRINT_WINDOW_HIERARCHY, 470 DEBUG_PRINT_WINDOW_HIERARCHY,
471 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 471 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7
472 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 472 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6
473 MEDIA_NEXT_TRACK, 473 MEDIA_NEXT_TRACK,
474 MEDIA_PLAY_PAUSE, 474 MEDIA_PLAY_PAUSE,
475 MEDIA_PREV_TRACK, 475 MEDIA_PREV_TRACK,
476 NEXT_IME, 476 NEXT_IME,
477 PREVIOUS_IME, 477 PREVIOUS_IME,
(...skipping 20 matching lines...) Expand all
498 TOGGLE_MIRROR_MODE, 498 TOGGLE_MIRROR_MODE,
499 TOGGLE_SPOKEN_FEEDBACK, 499 TOGGLE_SPOKEN_FEEDBACK,
500 TOGGLE_WIFI, 500 TOGGLE_WIFI,
501 TOUCH_HUD_CLEAR, 501 TOUCH_HUD_CLEAR,
502 VOLUME_DOWN, 502 VOLUME_DOWN,
503 VOLUME_MUTE, 503 VOLUME_MUTE,
504 VOLUME_UP, 504 VOLUME_UP,
505 #endif // defined(OS_CHROMEOS) 505 #endif // defined(OS_CHROMEOS)
506 }; 506 };
507 507
508 const size_t kActionsAllowedInAppModeLength = 508 const size_t kActionsAllowedInAppModeOrPinnedModeLength =
509 arraysize(kActionsAllowedInAppMode); 509 arraysize(kActionsAllowedInAppModeOrPinnedMode);
510
511 const AcceleratorAction kActionsAllowedInPinnedMode[] = {
512 TAKE_WINDOW_SCREENSHOT,
513 TAKE_PARTIAL_SCREENSHOT,
514 TAKE_SCREENSHOT,
515 #if defined(OS_CHROMEOS)
516 LOCK_SCREEN,
517 SUSPEND,
518 #endif
519 };
520
521 const size_t kActionsAllowedInPinnedModeLength =
522 arraysize(kActionsAllowedInPinnedMode);
510 523
511 const AcceleratorAction kActionsNeedingWindow[] = { 524 const AcceleratorAction kActionsNeedingWindow[] = {
512 CYCLE_BACKWARD_MRU, 525 CYCLE_BACKWARD_MRU,
513 CYCLE_FORWARD_MRU, 526 CYCLE_FORWARD_MRU,
514 TOGGLE_OVERVIEW, 527 TOGGLE_OVERVIEW,
515 WINDOW_CYCLE_SNAP_DOCK_LEFT, 528 WINDOW_CYCLE_SNAP_DOCK_LEFT,
516 WINDOW_CYCLE_SNAP_DOCK_RIGHT, 529 WINDOW_CYCLE_SNAP_DOCK_RIGHT,
517 WINDOW_MINIMIZE, 530 WINDOW_MINIMIZE,
518 TOGGLE_FULLSCREEN, 531 TOGGLE_FULLSCREEN,
519 TOGGLE_MAXIMIZED, 532 TOGGLE_MAXIMIZED,
(...skipping 27 matching lines...) Expand all
547 TOGGLE_WIFI, 560 TOGGLE_WIFI,
548 VOLUME_DOWN, 561 VOLUME_DOWN,
549 VOLUME_MUTE, 562 VOLUME_MUTE,
550 VOLUME_UP, 563 VOLUME_UP,
551 #endif // defined(OS_CHROMEOS) 564 #endif // defined(OS_CHROMEOS)
552 }; 565 };
553 566
554 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 567 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
555 568
556 } // namespace ash 569 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698