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

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: rebase 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
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 kActionsAllowedInAppMode[] = {
oshima 2016/06/18 06:43:03 ...InAppModeOrPinnedMode
hidehiko 2016/06/18 08:32:13 Done.
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 TOGGLE_SPOKEN_FEEDBACK, 546 TOGGLE_SPOKEN_FEEDBACK,
547 TOGGLE_WIFI, 547 TOGGLE_WIFI,
548 VOLUME_DOWN, 548 VOLUME_DOWN,
549 VOLUME_MUTE, 549 VOLUME_MUTE,
550 VOLUME_UP, 550 VOLUME_UP,
551 #endif // defined(OS_CHROMEOS) 551 #endif // defined(OS_CHROMEOS)
552 }; 552 };
553 553
554 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 554 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
555 555
556 const AcceleratorAction kActionsAllowedInPinnedMode[] = {
557 TAKE_WINDOW_SCREENSHOT,
558 TAKE_PARTIAL_SCREENSHOT,
559 TAKE_SCREENSHOT,
560 #if defined(OS_CHROMEOS)
561 LOCK_SCREEN,
562 SUSPEND,
563 #endif
564 };
565
566 const size_t kActionsAllowedInPinnedModeLength =
567 arraysize(kActionsAllowedInPinnedMode);
568
556 } // namespace ash 569 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698