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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/user/tray_user.cc

Issue 575653002: Revert of ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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 | « ash/system/tray/system_tray_delegate.h ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index dcac2a9ca71c3bea3784a032a04e934fd7343b3b..9851ba15a0f05f9047272930420aa5f5ff62a9ec 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -137,9 +137,6 @@
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:
@@ -178,7 +175,7 @@
}
}
- if (delegate->IsUserSupervised()) {
+ if (status == user::LOGGED_IN_SUPERVISED) {
label_->SetText(
l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL));
} else if (status == user::LOGGED_IN_GUEST) {
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | ash/system/user/user_card_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698