chrome/browser/policy/cloud/policy_header_service_factory.cc - Issue 2638623006: Merge {Device,User}ActiveDirectoryPolicyManager into a single class

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

Issue 2638623006: Merge {Device,User}ActiveDirectoryPolicyManager into a single class (Closed)

Patch Set: Have factories return unique_ptr Created 3 years, 11 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:

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

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

index fa0bb3d2bbab4df4068ee57248aa4fa27ae25709..3eb82fa481d3481ab6c245fdd132a91870e1c277 100644

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

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

@@ -19,8 +19,8 @@

#include "components/policy/core/common/cloud/policy_header_service.h"

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

-#include "chrome/browser/chromeos/policy/user_active_directory_policy_manager.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"

#else

@@ -99,7 +99,7 @@ KeyedService* PolicyHeaderServiceFactory::BuildServiceInstanceFor(

if (cloud_manager) {

user_store = cloud_manager->core()->store();

} else {

- UserActiveDirectoryPolicyManager* active_directory_manager =

+ ActiveDirectoryPolicyManager* active_directory_manager =

UserPolicyManagerFactoryChromeOS::

GetActiveDirectoryPolicyManagerForProfile(profile);

if (!active_directory_manager)