Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2315)

Unified Diff: chrome/browser/policy/cloud/policy_header_service_factory.cc

Issue 2530103002: Remove device policy store from PolicyHeaderService since it's not used. (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | components/policy/core/common/cloud/policy_header_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5e1f08e956bddaf63af450f7a709b53c9a63a3a8..8375c769a0be89dd359694ae161e234d845bd509 100644
--- a/chrome/browser/policy/cloud/policy_header_service_factory.cc
+++ b/chrome/browser/policy/cloud/policy_header_service_factory.cc
@@ -20,7 +20,6 @@
#if defined(OS_CHROMEOS)
#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_cloud_policy_manager_chromeos.h"
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
#else
@@ -103,18 +102,11 @@ KeyedService* PolicyHeaderServiceFactory::BuildServiceInstanceFor(
if (!manager)
return NULL;
CloudPolicyStore* user_store = manager->core()->store();
- CloudPolicyStore* device_store = NULL;
-#if defined(OS_CHROMEOS)
- // TODO(tnagel): Add support for Active Directory management.
- if (!connector->GetDeviceCloudPolicyManager())
- return NULL;
- device_store = connector->GetDeviceCloudPolicyManager()->core()->store();
-#endif
std::unique_ptr<PolicyHeaderService> service =
base::MakeUnique<PolicyHeaderService>(
device_management_service->GetServerUrl(), kPolicyVerificationKeyHash,
- user_store, device_store);
+ user_store);
return new PolicyHeaderServiceWrapper(std::move(service));
}
« no previous file with comments | « no previous file | components/policy/core/common/cloud/policy_header_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698