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

Side by Side Diff: chrome/browser/policy/profile_policy_connector.cc

Issue 2486813002: Add DeviceADPolicyManager to provide AD policy. (Closed)
Patch Set: Address Bernhard's comments 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/profile_policy_connector.h" 5 #include "chrome/browser/policy/profile_policy_connector.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "components/policy/core/browser/browser_policy_connector.h" 14 #include "components/policy/core/browser/browser_policy_connector.h"
15 #include "components/policy/core/common/cloud/cloud_policy_core.h" 15 #include "components/policy/core/common/cloud/cloud_policy_core.h"
16 #include "components/policy/core/common/cloud/cloud_policy_manager.h" 16 #include "components/policy/core/common/cloud/cloud_policy_manager.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/configuration_policy_provider.h" 18 #include "components/policy/core/common/configuration_policy_provider.h"
19 #include "components/policy/core/common/policy_bundle.h" 19 #include "components/policy/core/common/policy_bundle.h"
20 #include "components/policy/core/common/policy_map.h" 20 #include "components/policy/core/common/policy_map.h"
21 #include "components/policy/core/common/policy_namespace.h" 21 #include "components/policy/core/common/policy_namespace.h"
22 #include "components/policy/core/common/policy_service_impl.h" 22 #include "components/policy/core/common/policy_service_impl.h"
23 #include "components/policy/core/common/schema_registry_tracking_policy_provider .h" 23 #include "components/policy/core/common/schema_registry_tracking_policy_provider .h"
24 #include "google_apis/gaia/gaia_auth_util.h" 24 #include "google_apis/gaia/gaia_auth_util.h"
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
27 #include "chrome/browser/browser_process_platform_part.h" 27 #include "chrome/browser/browser_process_platform_part.h"
28 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 28 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
29 #include "chrome/browser/chromeos/policy/device_active_directory_policy_manager. h"
29 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 30 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
30 #include "chrome/browser/chromeos/policy/device_local_account.h" 31 #include "chrome/browser/chromeos/policy/device_local_account.h"
31 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" 32 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
32 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h" 33 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
33 #include "components/user_manager/user.h" 34 #include "components/user_manager/user.h"
34 #include "components/user_manager/user_manager.h" 35 #include "components/user_manager/user_manager.h"
35 #endif 36 #endif
36 37
37 namespace policy { 38 namespace policy {
38 39
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 84
84 if (connector->GetPlatformProvider()) { 85 if (connector->GetPlatformProvider()) {
85 wrapped_platform_policy_provider_.reset( 86 wrapped_platform_policy_provider_.reset(
86 new SchemaRegistryTrackingPolicyProvider( 87 new SchemaRegistryTrackingPolicyProvider(
87 connector->GetPlatformProvider())); 88 connector->GetPlatformProvider()));
88 wrapped_platform_policy_provider_->Init(schema_registry); 89 wrapped_platform_policy_provider_->Init(schema_registry);
89 policy_providers_.push_back(wrapped_platform_policy_provider_.get()); 90 policy_providers_.push_back(wrapped_platform_policy_provider_.get());
90 } 91 }
91 92
92 #if defined(OS_CHROMEOS) 93 #if defined(OS_CHROMEOS)
93 if (connector->GetDeviceCloudPolicyManager()) 94 if (connector->GetDeviceCloudPolicyManager()) {
94 policy_providers_.push_back(connector->GetDeviceCloudPolicyManager()); 95 policy_providers_.push_back(connector->GetDeviceCloudPolicyManager());
96 }
97 if (connector->GetDeviceActiveDirectoryPolicyManager()) {
98 policy_providers_.push_back(
99 connector->GetDeviceActiveDirectoryPolicyManager());
100 }
95 #endif 101 #endif
96 102
97 if (user_cloud_policy_manager) 103 if (user_cloud_policy_manager)
98 policy_providers_.push_back(user_cloud_policy_manager); 104 policy_providers_.push_back(user_cloud_policy_manager);
99 105
100 #if defined(OS_CHROMEOS) 106 #if defined(OS_CHROMEOS)
101 if (!user) { 107 if (!user) {
102 DCHECK(schema_registry); 108 DCHECK(schema_registry);
103 // This case occurs for the signin profile. 109 // This case occurs for the signin profile.
104 special_user_policy_provider_.reset( 110 special_user_policy_provider_.reset(
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 const char* name) const { 197 const char* name) const {
192 const PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, ""); 198 const PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
193 for (const ConfigurationPolicyProvider* provider : policy_providers_) { 199 for (const ConfigurationPolicyProvider* provider : policy_providers_) {
194 if (provider->policies().Get(chrome_ns).Get(name)) 200 if (provider->policies().Get(chrome_ns).Get(name))
195 return provider; 201 return provider;
196 } 202 }
197 return nullptr; 203 return nullptr;
198 } 204 }
199 205
200 } // namespace policy 206 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698