| 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 201ac8f190e4c16a5f867018f5964e4e5116beb3..1696b14f8ffc87853098d42969eea291e7ecdad9 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -394,16 +394,11 @@
|
|
|
| const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
|
| const {
|
| - if (!IsUserSupervised())
|
| + if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
|
| 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 {
|
|
|