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

Unified Diff: chrome/browser/profiles/profile_list_desktop.cc

Issue 1028603003: Fast user switcher: Distinguish supervised users from child accounts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DCHECK Created 5 years, 9 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 | « chrome/browser/profiles/avatar_menu.h ('k') | chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_list_desktop.cc
diff --git a/chrome/browser/profiles/profile_list_desktop.cc b/chrome/browser/profiles/profile_list_desktop.cc
index 755794b5ee1e02e12023968f16e46da6cf136053..e1b863be27f7994c4af9ef1048a49df7d691ec5c 100644
--- a/chrome/browser/profiles/profile_list_desktop.cc
+++ b/chrome/browser/profiles/profile_list_desktop.cc
@@ -51,12 +51,14 @@ void ProfileListDesktop::RebuildMenu() {
item->name = profile_info_->GetNameOfProfileAtIndex(i);
item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
item->profile_path = profile_info_->GetPathOfProfileAtIndex(i);
- item->supervised = profile_info_->ProfileIsSupervisedAtIndex(i);
+ item->legacy_supervised =
+ profile_info_->ProfileIsLegacySupervisedAtIndex(i);
+ item->child_account = profile_info_->ProfileIsChildAtIndex(i);
item->signed_in = !item->sync_state.empty();
if (!item->signed_in) {
item->sync_state = l10n_util::GetStringUTF16(
- item->supervised ? IDS_SUPERVISED_USER_AVATAR_LABEL :
- IDS_PROFILES_LOCAL_PROFILE_STATE);
+ item->legacy_supervised ? IDS_SUPERVISED_USER_AVATAR_LABEL :
+ IDS_PROFILES_LOCAL_PROFILE_STATE);
}
item->active = profile_info_->GetPathOfProfileAtIndex(i) ==
active_profile_path_;
« no previous file with comments | « chrome/browser/profiles/avatar_menu.h ('k') | chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698