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

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

Issue 601643002: Use a distinct source parameter on gaia endpoints for the reconcilor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@uber
Patch Set: Remove functions Created 6 years, 3 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/ui/auto_login_infobar_delegate.cc ('k') | components/signin/core/browser/signin_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/signin/core/browser/account_reconcilor.cc
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
index 57c5e0764b921c458364fd0dcfe0f8adef3d24b9..388a5921414d6892e1df13e68501460f6438e6d2 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -61,6 +61,7 @@ AccountReconcilor::AccountReconcilor(ProfileOAuth2TokenService* token_service,
signin_manager_(signin_manager),
client_(client),
merge_session_helper_(token_service_,
+ GaiaConstants::kReconcilorSource,
client->GetURLRequestContext(),
this),
registered_with_token_service_(false),
@@ -243,12 +244,8 @@ void AccountReconcilor::StartReconcile() {
void AccountReconcilor::GetAccountsFromCookie(
GetAccountsFromCookieCallback callback) {
get_gaia_accounts_callbacks_.push_back(callback);
- if (!gaia_fetcher_) {
- // There is no list account request in flight.
- gaia_fetcher_.reset(new GaiaAuthFetcher(
- this, GaiaConstants::kChromeSource, client_->GetURLRequestContext()));
- gaia_fetcher_->StartListAccounts();
- }
+ if (!gaia_fetcher_)
+ MayBeDoNextListAccounts();
}
void AccountReconcilor::StartFetchingExternalCcResult() {
@@ -302,7 +299,8 @@ void AccountReconcilor::OnListAccountsFailure(
void AccountReconcilor::MayBeDoNextListAccounts() {
if (!get_gaia_accounts_callbacks_.empty()) {
gaia_fetcher_.reset(new GaiaAuthFetcher(
- this, GaiaConstants::kChromeSource, client_->GetURLRequestContext()));
+ this, GaiaConstants::kReconcilorSource,
+ client_->GetURLRequestContext()));
gaia_fetcher_->StartListAccounts();
}
}
« no previous file with comments | « chrome/browser/ui/auto_login_infobar_delegate.cc ('k') | components/signin/core/browser/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698