Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
index 4445d3ec1b98f5948f2719f78f87a00660c03fc7..8c8a8066102e4098acf27f25fcd2f9da57f4f3f3 100644 |
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
@@ -394,13 +394,18 @@ SystemTrayDelegateChromeOS::GetSupervisedUserManagerName() const { |
const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage() |
const { |
- if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED) |
+ if (!IsUserSupervised()) |
return base::string16(); |
return l10n_util::GetStringFUTF16( |
IDS_USER_IS_SUPERVISED_BY_NOTICE, |
base::UTF8ToUTF16(GetSupervisedUserManager())); |
} |
+bool SystemTrayDelegateChromeOS::IsUserSupervised() const { |
+ user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser(); |
+ return user && user->IsSupervised(); |
+} |
+ |
bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const { |
return UpgradeDetector::GetInstance()->notify_upgrade(); |
} |