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

Unified Diff: components/signin/core/browser/account_reconcilor.h

Issue 1162103003: ListAccounts will return the Gaia ID as well as the email of the account. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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: components/signin/core/browser/account_reconcilor.h
diff --git a/components/signin/core/browser/account_reconcilor.h b/components/signin/core/browser/account_reconcilor.h
index 801be87b46b884744bf4fceec74f2439271be64c..a6feb7444d2c03485ba370b761f3b419da9d4cfe 100644
--- a/components/signin/core/browser/account_reconcilor.h
+++ b/components/signin/core/browser/account_reconcilor.h
@@ -64,11 +64,6 @@ class AccountReconcilor : public KeyedService,
return registered_with_token_service_;
}
- const std::vector<std::pair<std::string, bool> >& GetGaiaAccountsForTesting()
- const {
- return gaia_accounts_;
- }
-
friend class AccountReconcilorTest;
FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, SigninManagerRegistration);
FRIEND_TEST_ALL_PREFIXES(AccountReconcilorTest, Reauth);
@@ -140,7 +135,7 @@ class AccountReconcilor : public KeyedService,
const std::string& account_id,
const GoogleServiceAuthError& error) override;
void OnGaiaAccountsInCookieUpdated(
- const std::vector<std::pair<std::string, bool> >& accounts,
+ const std::vector<gaia::ListedAccount>& accounts,
const GoogleServiceAuthError& error) override;
// Overriden from OAuth2TokenService::Observer.
@@ -183,10 +178,9 @@ class AccountReconcilor : public KeyedService,
// Used during reconcile action.
// These members are used to validate the gaia cookie. |gaia_accounts_|
// holds the state of google accounts in the gaia cookie. Each element is
- // a pair that holds the email address of the account and a boolean that
- // indicates whether the account is valid or not. The accounts in the vector
- // are ordered the in same way as the gaia cookie.
- std::vector<std::pair<std::string, bool> > gaia_accounts_;
+ // holds the email address, gaia id and validity as returned from GAIA. The
+ // accounts in the vector are ordered the in same way as the gaia cookie.
+ std::vector<gaia::ListedAccount> gaia_accounts_;
// Used during reconcile action.
// These members are used to validate the tokens in OAuth2TokenService.
« no previous file with comments | « components/signin/core/browser/about_signin_internals.cc ('k') | components/signin/core/browser/account_reconcilor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698