ash/accelerators/accelerator_controller.cc - Issue 14587007: Unify and change logout/sleep/lock shortcuts

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_controller.cc

Issue 14587007: Unify and change logout/sleep/lock shortcuts (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: review Created 7 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_controller.cc

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

index f7a9ecba6754a227faa73cdc8cf3f3154a554106..62e46354db8ba67805793c0f1be12fe70dc9a9aa 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -574,8 +574,9 @@ bool AcceleratorController::PerformAction(int action,

case OPEN_FEEDBACK_PAGE:

ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();

return true;

- case EXIT:

- Shell::GetInstance()->delegate()->Exit();

+ case EXIT_PRESSED:

+ case EXIT_RELEASED:

+ exit_warning_handler_.HandleExitKey(action == EXIT_PRESSED);

return true;

case NEW_INCOGNITO_WINDOW:

Shell::GetInstance()->delegate()->NewWindow(true /* is_incognito */);