chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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/chromeos/policy/browser_policy_connector_chromeos.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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/policy/active_directory_policy_manager.cc ('K') | « chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h ('k') | chrome/browser/chromeos/policy/device_active_directory_policy_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bcdcf12bffefb992ff1932189ae5897018f070aa..0ebd399bb5e0fed8504bc6c2195bb84c8b192058 100644

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

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

@@ -20,11 +20,11 @@

#include "base/threading/sequenced_worker_pool.h"

#include "base/threading/thread_task_runner_handle.h"

#include "chrome/browser/chromeos/attestation/attestation_ca_client.h"

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

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

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

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

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

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

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

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

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

@@ -116,8 +116,9 @@ BrowserPolicyConnectorChromeOS::BrowserPolicyConnectorChromeOS()

->StartAuthPolicyService();

device_active_directory_policy_manager_ =

- new DeviceActiveDirectoryPolicyManager(

- std::move(device_cloud_policy_store));

+ ActiveDirectoryPolicyManager::CreateForDevicePolicy(

+ std::move(device_cloud_policy_store))

+ .release();

AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>(

device_active_directory_policy_manager_));

} else {