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

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

Issue 1117453002: Add gaia_id to ProfileInfoCache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comments Created 5 years, 7 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
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 e1b863be27f7994c4af9ef1048a49df7d691ec5c..bfa0c4f242b29f5c43186ec64c40793b36275eb1 100644
--- a/chrome/browser/profiles/profile_list_desktop.cc
+++ b/chrome/browser/profiles/profile_list_desktop.cc
@@ -49,14 +49,14 @@ void ProfileListDesktop::RebuildMenu() {
i,
icon);
item->name = profile_info_->GetNameOfProfileAtIndex(i);
- item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
+ item->username = profile_info_->GetUserNameOfProfileAtIndex(i);
item->profile_path = profile_info_->GetPathOfProfileAtIndex(i);
item->legacy_supervised =
profile_info_->ProfileIsLegacySupervisedAtIndex(i);
item->child_account = profile_info_->ProfileIsChildAtIndex(i);
- item->signed_in = !item->sync_state.empty();
+ item->signed_in = profile_info_->ProfileIsAuthenticatedAtIndex(i);
if (!item->signed_in) {
- item->sync_state = l10n_util::GetStringUTF16(
+ item->username = l10n_util::GetStringUTF16(
item->legacy_supervised ? IDS_SUPERVISED_USER_AVATAR_LABEL :
IDS_PROFILES_LOCAL_PROFILE_STATE);
}
« no previous file with comments | « chrome/browser/profiles/profile_info_interface.h ('k') | chrome/browser/profiles/profile_list_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698