chrome/browser/policy/cloud/user_policy_signin_service.cc - Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adding DO2TS.GetDeviceAccountId and minor CR fixes (learning to wrap) Created 7 years, 4 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/invalidation/ticl_invalidation_service.h ('K') | « chrome/browser/policy/cloud/cloud_policy_client_registration_helper.cc ('k') | chrome/browser/profiles/profile_downloader.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 baef750073bc0171cdf4c8808932358a8e591fe7..8b26a1b802523a94e78cb4f3c14f28ad0523d93c 100644

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

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

@@ -39,7 +39,8 @@ UserPolicySigninService::UserPolicySigninService(

// ProfileOAuth2TokenService should not yet have loaded its tokens since this

// happens in the background after PKS initialization - so this service

// should always be created before the oauth token is available.

- DCHECK(!oauth2_token_service_->RefreshTokenIsAvailable());

+ DCHECK(!oauth2_token_service_->RefreshTokenIsAvailable(

+ oauth2_token_service_->GetPrimaryAccountId()));

// Listen for an OAuth token to become available so we can register a client

// if for some reason the client is not already registered (for example, if

@@ -145,7 +146,8 @@ void UserPolicySigninService::OnInitializationCompleted(

DVLOG_IF(1, manager->IsClientRegistered())

<< "Client already registered - not fetching DMToken";

if (!manager->IsClientRegistered()) {

- if (!oauth2_token_service_->RefreshTokenIsAvailable()) {

+ if (!oauth2_token_service_->RefreshTokenIsAvailable(

+ oauth2_token_service_->GetPrimaryAccountId())) {

// No token yet - this class listens for OnRefreshTokenAvailable()

// and will re-attempt registration once the token is available.

DLOG(WARNING) << "No OAuth Refresh Token - delaying policy download";