Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5613)

Unified Diff: ash/system/chromeos/supervised/tray_supervised_user.cc

Issue 783963002: Tray message changed for child accounts. Warning bubble removed for child accounts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Inline temporarily removed. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/tray/default_system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
}
« no previous file with comments | « no previous file | ash/system/tray/default_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698