ash/accelerators/accelerator_table.cc - Issue 2013933002: Fix shelf alignment locking for power button.

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 2013933002: Fix shelf alignment locking for power button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove compositor DCHECK workaround. Created 4 years, 7 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 4c772aec307ba8ba4582344d6ba0d26958d49ff5..0fc0901e4ea81314881269fc23ee325d82684347 100644

--- a/ash/accelerators/accelerator_table.cc

+++ b/ash/accelerators/accelerator_table.cc

@@ -262,7 +262,10 @@ const AcceleratorData kDebugAcceleratorData[] = {

MAGNIFY_SCREEN_ZOOM_OUT},

{true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},

// Extra shortcuts to lock the screen on linux desktop.

- {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN},

+ {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_PRESSED},

+ {false, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_RELEASED},

+ {true, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_PRESSED},

+ {false, ui::VKEY_P, ui::EF_ALT_DOWN, POWER_RELEASED},

{true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED},

{false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED},

{true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,

« no previous file with comments | « no previous file | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »