| Index: ash/system/chromeos/supervised/tray_supervised_user.cc
|
| diff --git a/ash/system/chromeos/supervised/tray_supervised_user.cc b/ash/system/chromeos/supervised/tray_supervised_user.cc
|
| index aa47fcfd7997969f9526ced8bf2035644d294b43..53287e6f5f5ebe721e1634b4e197fa80084db698 100644
|
| --- a/ash/system/chromeos/supervised/tray_supervised_user.cc
|
| +++ b/ash/system/chromeos/supervised/tray_supervised_user.cc
|
| @@ -82,6 +82,7 @@ void TraySupervisedUser::UpdateAfterLoginStatusChange(
|
| return;
|
|
|
| if (is_user_supervised &&
|
| + !delegate->IsUserChild() &&
|
| status_ != ash::user::LOGGED_IN_LOCKED &&
|
| !delegate->GetSupervisedUserManager().empty())
|
| CreateOrUpdateSupervisedWarningNotification();
|
| @@ -113,9 +114,11 @@ void TraySupervisedUser::OnCustodianInfoChanged() {
|
| SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
|
| std::string manager_name = delegate->GetSupervisedUserManager();
|
| if (!manager_name.empty()) {
|
| - if (!message_center::MessageCenter::Get()->FindVisibleNotificationById(
|
| - kNotificationId))
|
| + if (!delegate->IsUserChild() &&
|
| + !message_center::MessageCenter::Get()->FindVisibleNotificationById(
|
| + kNotificationId)) {
|
| CreateOrUpdateSupervisedWarningNotification();
|
| + }
|
| UpdateMessage();
|
| }
|
| }
|
|
|