ash/system/user/user_card_view.cc - Issue 425293002: Rename "managed (mode|user)" to "supervised user" (part 9)

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 425293002: Rename "managed (mode|user)" to "supervised user" (part 9) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 8549846665718f60a1a77af86d58b6387a023380..d0b77ab64b4a763b766bbad5a93146e1175c5920 100644

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

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

@@ -396,8 +396,7 @@ void UserCardView::AddUserContent(user::LoginStatus login_status,

(multiprofile_index || !IsMultiAccountSupportedAndUserActive())) {

base::string16 user_email_string =

login_status == user::LOGGED_IN_SUPERVISED

- ? l10n_util::GetStringUTF16(

- IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL)

+ ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)

: base::UTF8ToUTF16(

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

if (!user_email_string.empty()) {

« no previous file with comments | « ash/system/user/tray_user.cc ('k') | chrome/app/chromeos_strings.grdp » ('j') | no next file with comments »