chromeos/login/auth/stub_authenticator.cc - Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

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: chromeos/login/auth/stub_authenticator.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv

Patch Set: rebased Created 5 years, 8 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

« chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('K') | « chrome/test/data/webui/ntp4_browsertest.cc ('k') | components/BUILD.gn » ('j') | components/components_tests.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/login/auth/stub_authenticator.cc

diff --git a/chromeos/login/auth/stub_authenticator.cc b/chromeos/login/auth/stub_authenticator.cc

index 8a3e30f263d0e6bbe8eae274dac6d297f7132972..4e9ee28d87f4a0c5bf6d53f7c29b6a465cf7328c 100644

--- a/chromeos/login/auth/stub_authenticator.cc

+++ b/chromeos/login/auth/stub_authenticator.cc

@@ -35,7 +35,9 @@ void StubAuthenticator::CompleteLogin(content::BrowserContext* context,

void StubAuthenticator::AuthenticateToLogin(content::BrowserContext* context,

const UserContext& user_context) {

authentication_context_ = context;

- if (user_context == expected_user_context_) {

+ // Don't compare the entire |expected_user_context_| to |user_context| because

+ // during non-online re-auth |user_context| does not have a gaia id.

+ if (expected_user_context_.GetUserID() == user_context.GetUserID()) {

message_loop_->PostTask(

FROM_HERE, base::Bind(&StubAuthenticator::OnAuthSuccess, this));

return;

« chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('K') | « chrome/test/data/webui/ntp4_browsertest.cc ('k') | components/BUILD.gn » ('j') | components/components_tests.gyp » ('J')