chrome/browser/policy/profile_policy_connector_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/profile_policy_connector_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/profile_policy_connector_factory.cc

diff --git a/chrome/browser/policy/profile_policy_connector_factory.cc b/chrome/browser/policy/profile_policy_connector_factory.cc

index 9d49fd59ce642c3e108e6b32a2e0fad645ced42d..87e4631c1d983c226a2c7c8e3c907bc5768ddd67 100644

--- a/chrome/browser/policy/profile_policy_connector_factory.cc

+++ b/chrome/browser/policy/profile_policy_connector_factory.cc

@@ -20,9 +20,9 @@

#include "components/policy/core/common/policy_service_impl.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/device_cloud_policy_manager_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"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

@@ -128,7 +128,7 @@ ProfilePolicyConnectorFactory::CreateForBrowserContextInternal(

CloudPolicyManager* user_cloud_policy_manager =

UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(

profile);

- UserActiveDirectoryPolicyManager* active_directory_manager =

+ ActiveDirectoryPolicyManager* active_directory_manager =

UserPolicyManagerFactoryChromeOS::

GetActiveDirectoryPolicyManagerForProfile(profile);

if (user_cloud_policy_manager) {