ash/system/user/user_card_view.cc - Issue 561713002: ash: Add checks for supervised users.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 561713002: ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Missed child class updated. Checks improved. 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:

Index: ash/system/user/user_card_view.cc

diff --git a/ash/system/user/user_card_view.cc b/ash/system/user/user_card_view.cc

index d0b77ab64b4a763b766bbad5a93146e1175c5920..1e532c38f15d146132ddb6a056e00755a915cfe3 100644

--- a/ash/system/user/user_card_view.cc

+++ b/ash/system/user/user_card_view.cc

@@ -394,8 +394,11 @@ void UserCardView::AddUserContent(user::LoginStatus login_status,

views::Label* user_email = NULL;

if (login_status != user::LOGGED_IN_GUEST &&

(multiprofile_index || !IsMultiAccountSupportedAndUserActive())) {

+ SystemTrayDelegate* tray_delegate =

+ Shell::GetInstance()->system_tray_delegate();

base::string16 user_email_string =

- login_status == user::LOGGED_IN_SUPERVISED

+ (login_status == user::LOGGED_IN_SUPERVISED ||

+ tray_delegate->IsUserSupervised())

? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)

: base::UTF8ToUTF16(

delegate->GetUserInfo(multiprofile_index)->GetEmail());