ash/wm/lock_state_controller_unittest.cc - Issue 811033002: Add device policy to disallow shutdown - ash UI modifications

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

Issue 811033002: Add device policy to disallow shutdown - ash UI modifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reduced scope of CL (ash only now, removed webui changes) Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« ash/wm/lock_state_controller.h ('K') | « ash/wm/lock_state_controller.cc ('k') | ash/wm/power_button_controller.cc » ('j') | chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/lock_state_controller_unittest.cc

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

index 4f3c4d054a9671b3a23bffe6082eff4a60f459b9..ec5af74ef6f85b5721035399aadad17da4529b4a 100644

--- a/ash/wm/lock_state_controller_unittest.cc

+++ b/ash/wm/lock_state_controller_unittest.cc

@@ -818,7 +818,7 @@ TEST_F(LockStateControllerTest, ShutdownWithoutButton) {

TEST_F(LockStateControllerTest, RequestShutdownFromLoginScreen) {

Initialize(false, user::LOGGED_IN_NONE);

- lock_state_controller_->RequestShutdown(LockStateController::POWER_OFF);

+ lock_state_controller_->RequestShutdownOrRestart();

ExpectShutdownAnimationStarted();

Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);

@@ -840,7 +840,7 @@ TEST_F(LockStateControllerTest, RequestShutdownFromLockScreen) {

Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);

ExpectPostLockAnimationFinished();

- lock_state_controller_->RequestShutdown(LockStateController::POWER_OFF);

+ lock_state_controller_->RequestShutdownOrRestart();

ExpectShutdownAnimationStarted();

Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);