| Index: chrome/browser/ui/ash/system_tray_delegate_linux.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_linux.cc b/chrome/browser/ui/ash/system_tray_delegate_linux.cc
|
| index fbe0ef03ecb0572fc207cc3848d5e25f1c1c8add..db5e8130e04d5ab848a3120a3d187443a75e0fc7 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_linux.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_linux.cc
|
| @@ -71,16 +71,15 @@ class SystemTrayDelegateLinux : public ash::SystemTrayDelegate,
|
| return base::string16();
|
| }
|
|
|
| - virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
|
| + virtual const std::string GetSupervisedUserManager() const OVERRIDE {
|
| return std::string();
|
| }
|
|
|
| - virtual const base::string16 GetLocallyManagedUserManagerName() const
|
| - OVERRIDE {
|
| + virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE {
|
| return base::string16();
|
| }
|
|
|
| - virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE {
|
| + virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE {
|
| return base::string16();
|
| }
|
|
|
| @@ -146,7 +145,7 @@ class SystemTrayDelegateLinux : public ash::SystemTrayDelegate,
|
| virtual void ShowPublicAccountInfo() OVERRIDE {
|
| }
|
|
|
| - virtual void ShowLocallyManagedUserInfo() OVERRIDE {
|
| + virtual void ShowSupervisedUserInfo() OVERRIDE {
|
| }
|
|
|
| virtual void ShowEnterpriseInfo() OVERRIDE {
|
|
|