OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/policy/browser_policy_connector_chromeos.h" | 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 ->StartAuthPolicyService(); | 116 ->StartAuthPolicyService(); |
117 | 117 |
118 device_active_directory_policy_manager_ = | 118 device_active_directory_policy_manager_ = |
119 ActiveDirectoryPolicyManager::CreateForDevicePolicy( | 119 ActiveDirectoryPolicyManager::CreateForDevicePolicy( |
120 std::move(device_cloud_policy_store)) | 120 std::move(device_cloud_policy_store)) |
121 .release(); | 121 .release(); |
122 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( | 122 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( |
123 device_active_directory_policy_manager_)); | 123 device_active_directory_policy_manager_)); |
124 } else { | 124 } else { |
125 state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>( | 125 state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>( |
126 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 126 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()); |
127 base::ThreadTaskRunnerHandle::Get()); | |
128 | 127 |
129 device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS( | 128 device_cloud_policy_manager_ = new DeviceCloudPolicyManagerChromeOS( |
130 std::move(device_cloud_policy_store), | 129 std::move(device_cloud_policy_store), |
131 base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get()); | 130 base::ThreadTaskRunnerHandle::Get(), state_keys_broker_.get()); |
132 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( | 131 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( |
133 device_cloud_policy_manager_)); | 132 device_cloud_policy_manager_)); |
134 } | 133 } |
135 } | 134 } |
136 | 135 |
137 global_user_cloud_policy_provider_ = new ProxyPolicyProvider(); | 136 global_user_cloud_policy_provider_ = new ProxyPolicyProvider(); |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 device_cloud_policy_manager_->device_store()->policy(); | 375 device_cloud_policy_manager_->device_store()->policy(); |
377 if (policy_data) { | 376 if (policy_data) { |
378 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 377 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
379 policy_data->device_affiliation_ids().end()); | 378 policy_data->device_affiliation_ids().end()); |
380 } | 379 } |
381 } | 380 } |
382 return affiliation_ids; | 381 return affiliation_ids; |
383 } | 382 } |
384 | 383 |
385 } // namespace policy | 384 } // namespace policy |
OLD | NEW |