chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc - Issue 1380103004: Delay fetching account info until OnRefreshTokensLoaded().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

Issue 1380103004: Delay fetching account info until OnRefreshTokensLoaded(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix iOs Created 5 years, 2 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/signin/fake_account_fetcher_service_builder.cc ('k') | chrome/browser/signin/oauth2_token_service_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

diff --git a/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc b/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

index d0e6559bcd0b1f80eeaf011094bec58564e6eebc..30262785effc829777f5fc5d185cfe2b827ceaf5 100644

--- a/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

+++ b/chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

@@ -238,7 +238,10 @@ MutableProfileOAuth2TokenServiceDelegate::GetRequestContext() const {

void MutableProfileOAuth2TokenServiceDelegate::LoadCredentials(

const std::string& primary_account_id) {

- DCHECK(!primary_account_id.empty());

+ if (primary_account_id.empty()) {

+ FireRefreshTokensLoaded();

+ return;

+ }

ValidateAccountId(primary_account_id);

DCHECK(loading_primary_account_id_.empty());

DCHECK_EQ(0, web_data_service_request_);