Chromium Code Reviews| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
| index c02ae2efc245c842bb27de160007d93c9091ba20..665eb4ac5ad0d5bc11d9dad4cf9c0d2ab7b5415e 100644 |
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc |
| @@ -481,6 +481,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
| UTF8ToUTF16(GetEnterpriseDomain())); |
| } |
| + virtual const std::string GetLocallyManagedUserManager() const OVERRIDE { |
| + if (ash::user::LOGGED_IN_LOCALLY_MANAGED != GetUserLoginStatus()) |
|
Daniel Erat
2013/04/29 13:32:57
nit: if (GetUserLoginStatus() != ash::user::...)
Denis Kuznetsov (DE-MUC)
2013/04/29 14:14:58
Done.
|
| + return std::string(); |
| + return UserManager::Get()->GetManagerForManagedUser(GetUserEmail()); |
| + } |
| + |
| + virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE { |
| + if (ash::user::LOGGED_IN_LOCALLY_MANAGED != GetUserLoginStatus()) |
|
Daniel Erat
2013/04/29 13:32:57
nit: if (GetUserLoginStatus() != ash::user::...)
Denis Kuznetsov (DE-MUC)
2013/04/29 14:14:58
Done.
|
| + return string16(); |
| + return l10n_util::GetStringFUTF16(IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE, |
| + UTF8ToUTF16( |
| + GetLocallyManagedUserManager())); |
| + } |
| + |
| virtual bool SystemShouldUpgrade() const OVERRIDE { |
| return UpgradeDetector::GetInstance()->notify_upgrade(); |
| } |
| @@ -552,6 +566,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, |
| chrome::ShowPolicy(GetAppropriateBrowser()); |
| } |
| + virtual void ShowLocallyManagedUserInfo() OVERRIDE { |
| + // TODO(antrim): find out what should we show in this case. |
| + } |
| + |
| virtual void ShowEnterpriseInfo() OVERRIDE { |
| ash::user::LoginStatus status = GetUserLoginStatus(); |
| if (status == ash::user::LOGGED_IN_NONE || |