chrome/browser/ui/ash/system_tray_delegate_common.h - 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/ash/system_tray_delegate_common.h

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/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_common.cc » ('j') | chrome/chrome_browser_chromeos.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_common.h

diff --git a/chrome/browser/ui/ash/system_tray_delegate_common.h b/chrome/browser/ui/ash/system_tray_delegate_common.h

index 403d17ffd7829ea9bb7e349d8e617bbc116c5a3e..77279789279b658634c694f8de11c4a2d61b37c2 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_common.h

+++ b/chrome/browser/ui/ash/system_tray_delegate_common.h

@@ -59,7 +59,6 @@ class SystemTrayDelegateCommon : public ash::SystemTrayDelegate,

void ShowSupervisedUserInfo() override;

void ShowEnterpriseInfo() override;

void ShowUserLogin() override;

- void ShutDown() override;

void SignOut() override;

void RequestLockScreen() override;

void RequestRestartForUpdate() override;

@@ -94,6 +93,12 @@ class SystemTrayDelegateCommon : public ash::SystemTrayDelegate,

ash::CustodianInfoTrayObserver* observer) override;

void RemoveCustodianInfoTrayObserver(

ash::CustodianInfoTrayObserver* observer) override;

+ void AddShutdownPolicyObserver(

+ ash::ShutdownPolicyObserver* observer) override;

+ void RemoveShutdownPolicyObserver(

+ ash::ShutdownPolicyObserver* observer) override;

+ void ShouldRebootOnShutdown(

+ const ash::RebootOnShutdownCallback& callback) override;

private:

ash::SystemTrayNotifier* GetSystemTrayNotifier();