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

Side by Side 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 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/cloud/policy_header_service_factory.h" 5 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 14 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 #include "components/keyed_service/core/keyed_service.h" 15 #include "components/keyed_service/core/keyed_service.h"
16 #include "components/policy/core/browser/browser_policy_connector.h" 16 #include "components/policy/core/browser/browser_policy_connector.h"
17 #include "components/policy/core/common/cloud/cloud_policy_store.h" 17 #include "components/policy/core/common/cloud/cloud_policy_store.h"
18 #include "components/policy/core/common/cloud/device_management_service.h" 18 #include "components/policy/core/common/cloud/device_management_service.h"
19 #include "components/policy/core/common/cloud/policy_header_service.h" 19 #include "components/policy/core/common/cloud/policy_header_service.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
23 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
24 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 23 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
25 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 24 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
26 #else 25 #else
27 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 26 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
28 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 27 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
29 #endif 28 #endif
30 29
31 namespace policy { 30 namespace policy {
32 31
33 namespace { 32 namespace {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 CloudPolicyManager* manager = 95 CloudPolicyManager* manager =
97 UserCloudPolicyManagerFactoryChromeOS::GetForProfile( 96 UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
98 Profile::FromBrowserContext(context)); 97 Profile::FromBrowserContext(context));
99 #else 98 #else
100 CloudPolicyManager* manager = 99 CloudPolicyManager* manager =
101 UserCloudPolicyManagerFactory::GetForBrowserContext(context); 100 UserCloudPolicyManagerFactory::GetForBrowserContext(context);
102 #endif 101 #endif
103 if (!manager) 102 if (!manager)
104 return NULL; 103 return NULL;
105 CloudPolicyStore* user_store = manager->core()->store(); 104 CloudPolicyStore* user_store = manager->core()->store();
106 CloudPolicyStore* device_store = NULL;
107 #if defined(OS_CHROMEOS)
108 // TODO(tnagel): Add support for Active Directory management.
109 if (!connector->GetDeviceCloudPolicyManager())
110 return NULL;
111 device_store = connector->GetDeviceCloudPolicyManager()->core()->store();
112 #endif
113 105
114 std::unique_ptr<PolicyHeaderService> service = 106 std::unique_ptr<PolicyHeaderService> service =
115 base::MakeUnique<PolicyHeaderService>( 107 base::MakeUnique<PolicyHeaderService>(
116 device_management_service->GetServerUrl(), kPolicyVerificationKeyHash, 108 device_management_service->GetServerUrl(), kPolicyVerificationKeyHash,
117 user_store, device_store); 109 user_store);
118 return new PolicyHeaderServiceWrapper(std::move(service)); 110 return new PolicyHeaderServiceWrapper(std::move(service));
119 } 111 }
120 112
121 // static 113 // static
122 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() { 114 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() {
123 return base::Singleton<PolicyHeaderServiceFactory>::get(); 115 return base::Singleton<PolicyHeaderServiceFactory>::get();
124 } 116 }
125 117
126 } // namespace policy 118 } // namespace policy
OLDNEW
« 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