ash/wm/session_state_controller.cc - Issue 11238058: Do not start autoshutdown on lock button press.

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/wm/session_state_controller.cc

Issue 11238058: Do not start autoshutdown on lock button press. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 2 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/wm/session_state_controller.cc

diff --git a/ash/wm/session_state_controller.cc b/ash/wm/session_state_controller.cc

index 5253ac2b84e0c5e35ec87100052849c02d3c324b..c0901300c2a654bb486af1795243d071d0801e40 100644

--- a/ash/wm/session_state_controller.cc

+++ b/ash/wm/session_state_controller.cc

@@ -137,8 +137,8 @@ void SessionStateController::StartLockAnimationAndLockImmediately() {

OnLockTimeout();

}

-void SessionStateController::StartLockAnimation() {

- shutdown_after_lock_ = true;

+void SessionStateController::StartLockAnimation(bool shutdown_after_lock) {

+ shutdown_after_lock_ = shutdown_after_lock;

animator_->ShowBlackLayer();

animator_->StartAnimation(

« no previous file with comments | « ash/wm/session_state_controller.h ('k') | no next file » | no next file with comments »