ash/wm/power_button_controller.cc - Issue 11230050: ash : introduce second SessionStateController implementation.

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/power_button_controller.cc

Issue 11230050: ash : introduce second SessionStateController implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Merge with TOT, review fixes 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/power_button_controller.cc

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

index 8b6c549e8e9006184b55c96ef487d5426625ebdb..8195200a5d3d7c9c782c03ade88e12d780c195c6 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -94,7 +94,7 @@ void PowerButtonController::OnLockButtonEvent(

if (down)

controller_->StartLockAnimation(false);

else

- controller_->CancelLockWithOtherAnimation();

+ controller_->CancelLockAnimation();

}

} // namespace ash

« no previous file with comments | « ash/shell.cc ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | no next file with comments »