ash/accelerators/accelerator_table.cc - Issue 2078883003: Handle UNPIN operation in ash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: ash/accelerators/accelerator_table.cc

diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc

index 640d33dc2591d553366d4726736924dfd6ac0e98..ec7e0f3c2d439e9bac66cd696807740e5cbb35fb 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 },

{ 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,

@@ -512,6 +513,7 @@ const AcceleratorAction kActionsAllowedInPinnedMode[] = {

TAKE_WINDOW_SCREENSHOT,

TAKE_PARTIAL_SCREENSHOT,

TAKE_SCREENSHOT,

+ UNPIN,

#if defined(OS_CHROMEOS)

LOCK_SCREEN,

SUSPEND,

« no previous file with comments | « ash/accelerators/accelerator_table.h ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »