Index: chrome/browser/profiles/profile_info_cache.h |
diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h |
index 7b935f826ddd24bf630c45d43b1bedade7bcf852..ef9038c608122288cfd16ebc43081a1b6fd3527a 100644 |
--- a/chrome/browser/profiles/profile_info_cache.h |
+++ b/chrome/browser/profiles/profile_info_cache.h |
@@ -46,7 +46,8 @@ class ProfileInfoCache : public ProfileInfoInterface, |
// be shown in the menu. |
void AddProfileToCache(const base::FilePath& profile_path, |
const base::string16& name, |
- const base::string16& username, |
+ const std::string& gaia_id, |
+ const base::string16& user_name, |
size_t icon_index, |
const std::string& supervised_user_id); |
void DeleteProfileFromCache(const base::FilePath& profile_path); |
@@ -71,6 +72,7 @@ class ProfileInfoCache : public ProfileInfoInterface, |
bool GetBackgroundStatusOfProfileAtIndex(size_t index) const override; |
base::string16 GetGAIANameOfProfileAtIndex(size_t index) const override; |
base::string16 GetGAIAGivenNameOfProfileAtIndex(size_t index) const override; |
+ std::string GetGAIAIdOfProfileAtIndex(size_t index) const override; |
Evan Stade
2015/05/11 17:11:54
maybe not necessary to change in this patch, but t
Roger Tawa OOO till Jul 10th
2015/05/11 20:34:36
I had actually done that initially, but then saw t
Evan Stade
2015/05/11 20:35:38
thanks
|
// Returns the GAIA picture for the given profile. This may return NULL |
// if the profile does not have a GAIA picture or if the picture must be |
// loaded from disk. |
@@ -84,6 +86,7 @@ class ProfileInfoCache : public ProfileInfoInterface, |
std::string GetSupervisedUserIdOfProfileAtIndex(size_t index) const override; |
bool ProfileIsEphemeralAtIndex(size_t index) const override; |
bool ProfileIsUsingDefaultNameAtIndex(size_t index) const override; |
+ bool ProfileIsAuthenticatedAtIndex(size_t index) const override; |
bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const override; |
bool ProfileIsAuthErrorAtIndex(size_t index) const; |
@@ -94,7 +97,8 @@ class ProfileInfoCache : public ProfileInfoInterface, |
void SetNameOfProfileAtIndex(size_t index, const base::string16& name); |
void SetShortcutNameOfProfileAtIndex(size_t index, |
const base::string16& name); |
- void SetUserNameOfProfileAtIndex(size_t index, |
+ void SetAuthInfoOfProfileAtIndex(size_t index, |
+ const std::string& gaia_id, |
const base::string16& user_name); |
void SetAvatarIconOfProfileAtIndex(size_t index, size_t icon_index); |
void SetIsOmittedProfileAtIndex(size_t index, bool is_omitted); |