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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 6d17c67b43cc8af20001b96aa68f2180bf23f606..5533c6ce57c7564867c0b4173b4229b218da97fb 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -126,6 +126,7 @@ const AcceleratorData kAcceleratorData[] = {
{ false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
{ true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN },
{ true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
+ { 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
{ true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF },
{ true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY },
{ true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
@@ -557,6 +558,7 @@ const AcceleratorAction kActionsAllowedInPinnedMode[] = {
TAKE_WINDOW_SCREENSHOT,
TAKE_PARTIAL_SCREENSHOT,
TAKE_SCREENSHOT,
+ UNPIN,
#if defined(OS_CHROMEOS)
BRIGHTNESS_DOWN,
BRIGHTNESS_UP,
« 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