chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc - Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc

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/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc

Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 10 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/chromeos/policy/user_cloud_policy_token_forwarder.cc ('k') | chrome/browser/services/gcm/gcm_profile_service_unittest.cc » ('j') | chrome/browser/services/gcm/gcm_profile_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc

index fbb3abd47cb2f407ae07e3e44e8fe093496ea85a..586cddc95707f430424e8c343cdfe695cd677b2b 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.cc

@@ -10,6 +10,8 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/profile_oauth2_token_service.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

+#include "chrome/browser/signin/signin_manager.h"

+#include "chrome/browser/signin/signin_manager_factory.h"

#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"

namespace policy {

@@ -24,6 +26,7 @@ UserCloudPolicyTokenForwarderFactory::UserCloudPolicyTokenForwarderFactory()

: BrowserContextKeyedServiceFactory(

"UserCloudPolicyTokenForwarder",

BrowserContextDependencyManager::GetInstance()) {

+ DependsOn(SigninManagerFactory::GetInstance());

DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());

DependsOn(UserCloudPolicyManagerFactoryChromeOS::GetInstance());

}

@@ -38,9 +41,12 @@ BrowserContextKeyedService*

UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile);

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

- if (!token_service || !manager)

+ SigninManagerBase* signin_manager =

+ SigninManagerFactory::GetForProfile(profile);

+ if (!signin_manager || !token_service || !manager)

return NULL;

- return new UserCloudPolicyTokenForwarder(manager, token_service);

+ return new UserCloudPolicyTokenForwarder(manager, token_service,

+ signin_manager);

}

bool UserCloudPolicyTokenForwarderFactory::