| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| index e5a6bf8b28fb9546fc58142078ab9b28bd678b02..742a7cccf32d1119d5214fe10bf725194814bc4e 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| @@ -65,10 +65,9 @@ class SystemTrayDelegateChromeOS
|
| 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 OVERRIDE;
|
| - virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE;
|
| + virtual const std::string GetSupervisedUserManager() const OVERRIDE;
|
| + virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;
|
| + virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;
|
| virtual bool SystemShouldUpgrade() const OVERRIDE;
|
| virtual base::HourClockType GetHourClockType() const OVERRIDE;
|
| virtual void ShowSettings() OVERRIDE;
|
| @@ -86,7 +85,7 @@ class SystemTrayDelegateChromeOS
|
| virtual void ShowAccessibilityHelp() OVERRIDE;
|
| virtual void ShowAccessibilitySettings() OVERRIDE;
|
| virtual void ShowPublicAccountInfo() OVERRIDE;
|
| - virtual void ShowLocallyManagedUserInfo() OVERRIDE;
|
| + virtual void ShowSupervisedUserInfo() OVERRIDE;
|
| virtual void ShowEnterpriseInfo() OVERRIDE;
|
| virtual void ShowUserLogin() OVERRIDE;
|
| virtual bool ShowSpringChargerReplacementDialog() OVERRIDE;
|
|
|