| 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 a1a53675e5e46909a79f3a5f6f428422beb5e3ff..bbac7ba400249c4e6aa475c9cd91ae3f8a517826 100644
|
| --- a/ash/system/tray/default_system_tray_delegate.h
|
| +++ b/ash/system/tray/default_system_tray_delegate.h
|
| @@ -26,11 +26,10 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
|
| virtual const std::string GetEnterpriseDomain() const override;
|
| virtual const base::string16 GetEnterpriseMessage() const override;
|
| virtual const std::string GetSupervisedUserManager() const override;
|
| - virtual const base::string16 GetSupervisedUserManagerName() const
|
| - override;
|
| + virtual const base::string16 GetSupervisedUserManagerName() const override;
|
| virtual const base::string16 GetSupervisedUserMessage() const override;
|
| virtual bool IsUserSupervised() const override;
|
| - virtual bool SystemShouldUpgrade() const override;
|
| + virtual void GetSystemUpdateInfo(UpdateInfo* info) const override;
|
| virtual base::HourClockType GetHourClockType() const override;
|
| virtual void ShowSettings() override;
|
| virtual bool ShouldShowSettings() override;
|
|
|