chrome/browser/signin/signin_tracker.cc - Issue 11411267: Make sure to display an errors that occur during the chrome sign in process

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/signin_tracker.cc

Issue 11411267: Make sure to display an errors that occur during the chrome sign in process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit tests Created 8 years 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/password_manager/password_manager_delegate_impl.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/signin_tracker.cc

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

index 12a79c3a3c62b381d9e1a1386a14208b30eac36b..80518298292474498aaa772e0a51a3b14a471c63 100644

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

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

@@ -141,15 +141,11 @@ void SigninTracker::HandleServiceStateChange() {

// been cleared yet).

return;

}

- // If we haven't loaded all our service tokens yet, just exit (we'll be called

- // again when another token is loaded, or will transition to SigninFailed if

- // the loading fails).

- if (!AreServiceTokensLoaded(profile_))

- return;

if (!AreServicesSignedIn(profile_)) {

state_ = WAITING_FOR_GAIA_VALIDATION;

observer_->SigninFailed(service->GetAuthError());

- } else if (service->sync_initialized()) {

+ } else if (service->sync_initialized() && AreServiceTokensLoaded(profile_)) {

state_ = SIGNIN_COMPLETE;

observer_->SigninSuccess();

}