chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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

« chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('K') | « chrome/browser/ui/webui/chromeos/login/shutdown_policy_observer_unittest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | chrome/chrome_browser_chromeos.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

index d18edd869f3272d9f28d1fe4ee63a882d530f3b8..4e66575d705450cc61aef53455c01e91f3236504 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -1037,8 +1037,9 @@ void SigninScreenHandler::HandleShutdownSystem() {

chromeos::DBusThreadManager::Get()->

GetPowerManagerClient()->RequestShutdown();

#else

- ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown(

- ash::LockStateController::POWER_OFF);

+ ash::Shell::GetInstance()

+ ->lock_state_controller()

+ ->RequestShutdownOrRestart();

#endif

}