| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 // initialized from here instead of BrowserPolicyConnector::Init(). | 182 // initialized from here instead of BrowserPolicyConnector::Init(). |
| 183 | 183 |
| 184 device_cloud_policy_manager_->Initialize(local_state); | 184 device_cloud_policy_manager_->Initialize(local_state); |
| 185 device_cloud_policy_manager_->AddDeviceCloudPolicyManagerObserver(this); | 185 device_cloud_policy_manager_->AddDeviceCloudPolicyManagerObserver(this); |
| 186 RestartDeviceCloudPolicyInitializer(); | 186 RestartDeviceCloudPolicyInitializer(); |
| 187 } | 187 } |
| 188 | 188 |
| 189 device_local_account_policy_service_.reset( | 189 device_local_account_policy_service_.reset( |
| 190 new DeviceLocalAccountPolicyService( | 190 new DeviceLocalAccountPolicyService( |
| 191 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 191 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), |
| 192 chromeos::DeviceSettingsService::Get(), | 192 chromeos::DeviceSettingsService::Get(), chromeos::CrosSettings::Get(), |
| 193 chromeos::CrosSettings::Get(), | |
| 194 affiliated_invalidation_service_provider_.get(), | 193 affiliated_invalidation_service_provider_.get(), |
| 194 GetBackgroundTaskRunner(), GetBackgroundTaskRunner(), |
| 195 GetBackgroundTaskRunner(), | 195 GetBackgroundTaskRunner(), |
| 196 GetBackgroundTaskRunner(), | 196 content::BrowserThread::GetTaskRunnerForThread( |
| 197 GetBackgroundTaskRunner(), | |
| 198 content::BrowserThread::GetMessageLoopProxyForThread( | |
| 199 content::BrowserThread::IO), | 197 content::BrowserThread::IO), |
| 200 request_context)); | 198 request_context)); |
| 201 device_local_account_policy_service_->Connect(device_management_service()); | 199 device_local_account_policy_service_->Connect(device_management_service()); |
| 202 if (device_cloud_policy_manager_) { | 200 if (device_cloud_policy_manager_) { |
| 203 device_cloud_policy_invalidator_.reset(new AffiliatedCloudPolicyInvalidator( | 201 device_cloud_policy_invalidator_.reset(new AffiliatedCloudPolicyInvalidator( |
| 204 enterprise_management::DeviceRegisterRequest::DEVICE, | 202 enterprise_management::DeviceRegisterRequest::DEVICE, |
| 205 device_cloud_policy_manager_->core(), | 203 device_cloud_policy_manager_->core(), |
| 206 affiliated_invalidation_service_provider_.get())); | 204 affiliated_invalidation_service_provider_.get())); |
| 207 device_remote_commands_invalidator_.reset( | 205 device_remote_commands_invalidator_.reset( |
| 208 new AffiliatedRemoteCommandsInvalidator( | 206 new AffiliatedRemoteCommandsInvalidator( |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 device_cloud_policy_manager_->device_store()->policy(); | 382 device_cloud_policy_manager_->device_store()->policy(); |
| 385 if (policy_data) { | 383 if (policy_data) { |
| 386 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 384 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
| 387 policy_data->device_affiliation_ids().end()); | 385 policy_data->device_affiliation_ids().end()); |
| 388 } | 386 } |
| 389 } | 387 } |
| 390 return affiliation_ids; | 388 return affiliation_ids; |
| 391 } | 389 } |
| 392 | 390 |
| 393 } // namespace policy | 391 } // namespace policy |
| OLD | NEW |