| Index: ash/system/user/tray_user.cc
|
| diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
|
| index 9851ba15a0f05f9047272930420aa5f5ff62a9ec..f63ed0ae713eb045138c845faeddbc1efee95a0c 100644
|
| --- a/ash/system/user/tray_user.cc
|
| +++ b/ash/system/user/tray_user.cc
|
| @@ -137,6 +137,9 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| return;
|
| bool need_label = false;
|
| bool need_avatar = false;
|
| + SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
|
| + if (delegate->IsUserSupervised())
|
| + need_label = true;
|
| switch (status) {
|
| case user::LOGGED_IN_LOCKED:
|
| case user::LOGGED_IN_USER:
|
| @@ -175,7 +178,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| }
|
| }
|
|
|
| - if (status == user::LOGGED_IN_SUPERVISED) {
|
| + if (status == user::LOGGED_IN_SUPERVISED || delegate->IsUserSupervised()) {
|
| label_->SetText(
|
| l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
|
| } else if (status == user::LOGGED_IN_GUEST) {
|
|
|