ash/wm/power_button_controller.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/power_button_controller.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_unittest.cc ('k') | chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h » ('j') | chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/power_button_controller.cc

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

index 5a26a83cbf113911fd4fb23d6733e46ff880835d..4615dc8705e9674ef702a53bbf1f07cfc23c3896 100644

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

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

@@ -82,7 +82,7 @@ void PowerButtonController::OnPowerButtonEvent(

!controller_->LockRequested()) {

controller_->StartLockAnimationAndLockImmediately(false);

} else {

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

+ controller_->RequestShutdownOrRestart();

}

} else { // !has_legacy_power_button_