chrome/browser/policy/cloud/user_policy_signin_service.cc - Issue 33173005: Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

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/policy/cloud/user_policy_signin_service.cc

Issue 33173005: Correctly deal with tokens for supervised users in ProfileOAuth2TokenService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 1 month 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/managed_mode/managed_user_service.cc ('k') | chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud/user_policy_signin_service.cc

diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc

index c69826c74699306c2ba9424f9512d4c011ddd871..0ca237fbf24577999d189f07015ab0a73fea4e14 100644

--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc

+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc

@@ -111,12 +111,13 @@ void UserPolicySigninService::OnRefreshTokenAvailable(

return;

}

- std::string username = GetSigninManager()->GetAuthenticatedUsername();

- // Should not have OAuth tokens if the user isn't signed in.

- DCHECK(!username.empty());

+ // Ignore OAuth tokens for any account but the primary one.

+ if (account_id != oauth2_token_service_->GetPrimaryAccountId())

+ return;

// ProfileOAuth2TokenService now has a refresh token so initialize the

// UserCloudPolicyManager.

- InitializeForSignedInUser(username);

+ InitializeForSignedInUser(GetSigninManager()->GetAuthenticatedUsername());

}

void UserPolicySigninService::InitializeUserCloudPolicyManager(