| 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..5bd64e8ad6034f62ee6e02f2929810082c6698de 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 (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
|
| + return std::string();
|
| + return UserManager::Get()->GetManagerForManagedUser(GetUserEmail());
|
| + }
|
| +
|
| + virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
|
| + if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
|
| + 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,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| chrome::ShowPolicy(GetAppropriateBrowser());
|
| }
|
|
|
| + virtual void ShowLocallyManagedUserInfo() OVERRIDE {
|
| + // TODO(antrim): find out what should we show in this case.
|
| + // http://crbug.com/229762
|
| + }
|
| +
|
| virtual void ShowEnterpriseInfo() OVERRIDE {
|
| ash::user::LoginStatus status = GetUserLoginStatus();
|
| if (status == ash::user::LOGGED_IN_NONE ||
|
|
|