ash/system/tray/default_system_tray_delegate.h - Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7)

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/system/tray/default_system_tray_delegate.h

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: alphabetize (and rebase) Created 6 years, 5 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/system/tray/default_system_tray_delegate.h

diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h

index 75869320fe763673c6d507c0f06a9139254b6c68..84594bdd39e5336da2ab779e2761342bef771850 100644

--- a/ash/system/tray/default_system_tray_delegate.h

+++ b/ash/system/tray/default_system_tray_delegate.h

@@ -25,10 +25,10 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {

virtual void ChangeProfilePicture() OVERRIDE;

virtual const std::string GetEnterpriseDomain() const OVERRIDE;

virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;

- virtual const std::string GetLocallyManagedUserManager() const OVERRIDE;

- virtual const base::string16 GetLocallyManagedUserManagerName() const

+ virtual const std::string GetSupervisedUserManager() const OVERRIDE;

+ virtual const base::string16 GetSupervisedUserManagerName() const

OVERRIDE;

- virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE;

+ virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;

virtual bool SystemShouldUpgrade() const OVERRIDE;

virtual base::HourClockType GetHourClockType() const OVERRIDE;

virtual void ShowSettings() OVERRIDE;

@@ -47,7 +47,7 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {

virtual void ShowAccessibilitySettings() OVERRIDE;

virtual void ShowPublicAccountInfo() OVERRIDE;

virtual void ShowEnterpriseInfo() OVERRIDE;

- virtual void ShowLocallyManagedUserInfo() OVERRIDE;

+ virtual void ShowSupervisedUserInfo() OVERRIDE;

virtual void ShowUserLogin() OVERRIDE;

virtual bool ShowSpringChargerReplacementDialog() OVERRIDE;

virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE;