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

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

Issue 2078883003: Handle UNPIN operation in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Upload only diff. 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 119 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
120 ROTATE_WINDOW }, 120 ROTATE_WINDOW },
121 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB }, 121 { true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB },
122 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT }, 122 { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
123 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should 123 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
124 // act on release instead of press when using Search as a modifier key for 124 // act on release instead of press when using Search as a modifier key for
125 // extended keyboard shortcuts. 125 // extended keyboard shortcuts.
126 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST }, 126 { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
127 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN }, 127 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN },
128 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN }, 128 { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
129 { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN, UNPIN },
oshima 2016/06/18 04:18:13 New shortcuts should be assigned with search key.
hidehiko 2016/06/18 05:38:17 I already agreed with UX/PM to use ESC + SHIFT + S
129 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF }, 130 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF },
130 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 131 { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
131 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 132 { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
132 SHOW_KEYBOARD_OVERLAY }, 133 SHOW_KEYBOARD_OVERLAY },
133 { true, ui::VKEY_OEM_2, 134 { true, ui::VKEY_OEM_2,
134 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, 135 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
135 SHOW_KEYBOARD_OVERLAY }, 136 SHOW_KEYBOARD_OVERLAY },
136 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, 137 { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
137 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, 138 { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
138 SHOW_MESSAGE_CENTER_BUBBLE }, 139 SHOW_MESSAGE_CENTER_BUBBLE },
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 VOLUME_UP, 551 VOLUME_UP,
551 #endif // defined(OS_CHROMEOS) 552 #endif // defined(OS_CHROMEOS)
552 }; 553 };
553 554
554 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 555 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
555 556
556 const AcceleratorAction kActionsAllowedInPinnedMode[] = { 557 const AcceleratorAction kActionsAllowedInPinnedMode[] = {
557 TAKE_WINDOW_SCREENSHOT, 558 TAKE_WINDOW_SCREENSHOT,
558 TAKE_PARTIAL_SCREENSHOT, 559 TAKE_PARTIAL_SCREENSHOT,
559 TAKE_SCREENSHOT, 560 TAKE_SCREENSHOT,
561 UNPIN,
560 #if defined(OS_CHROMEOS) 562 #if defined(OS_CHROMEOS)
561 BRIGHTNESS_DOWN, 563 BRIGHTNESS_DOWN,
562 BRIGHTNESS_UP, 564 BRIGHTNESS_UP,
563 KEYBOARD_BRIGHTNESS_DOWN, 565 KEYBOARD_BRIGHTNESS_DOWN,
564 KEYBOARD_BRIGHTNESS_UP, 566 KEYBOARD_BRIGHTNESS_UP,
565 LOCK_SCREEN, 567 LOCK_SCREEN,
566 POWER_PRESSED, 568 POWER_PRESSED,
567 POWER_RELEASED, 569 POWER_RELEASED,
568 SUSPEND, 570 SUSPEND,
569 VOLUME_DOWN, 571 VOLUME_DOWN,
570 VOLUME_MUTE, 572 VOLUME_MUTE,
571 VOLUME_UP, 573 VOLUME_UP,
572 #endif 574 #endif
573 }; 575 };
574 576
575 const size_t kActionsAllowedInPinnedModeLength = 577 const size_t kActionsAllowedInPinnedModeLength =
576 arraysize(kActionsAllowedInPinnedMode); 578 arraysize(kActionsAllowedInPinnedMode);
577 579
578 } // namespace ash 580 } // namespace ash
OLDNEW
« ash/accelerators/accelerator_commands.cc ('K') | « ash/accelerators/accelerator_table.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698