| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser_policy_connector.h" | 5 #include "chrome/browser/policy/browser_policy_connector.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "chrome/browser/policy/policy_loader_win.h" | 40 #include "chrome/browser/policy/policy_loader_win.h" |
| 41 #elif defined(OS_MACOSX) | 41 #elif defined(OS_MACOSX) |
| 42 #include "chrome/browser/policy/policy_loader_mac.h" | 42 #include "chrome/browser/policy/policy_loader_mac.h" |
| 43 #include "chrome/browser/policy/preferences_mac.h" | 43 #include "chrome/browser/policy/preferences_mac.h" |
| 44 #elif defined(OS_POSIX) | 44 #elif defined(OS_POSIX) |
| 45 #include "chrome/browser/policy/config_dir_policy_loader.h" | 45 #include "chrome/browser/policy/config_dir_policy_loader.h" |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
| 49 #include "base/utf_string_conversions.h" | 49 #include "base/utf_string_conversions.h" |
| 50 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h" |
| 51 #include "chrome/browser/chromeos/attestation/attestation_policy_observer.h" |
| 50 #include "chrome/browser/chromeos/cros/cros_library.h" | 52 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 51 #include "chrome/browser/chromeos/login/user_manager.h" | 53 #include "chrome/browser/chromeos/login/user_manager.h" |
| 52 #include "chrome/browser/chromeos/policy/app_pack_updater.h" | 54 #include "chrome/browser/chromeos/policy/app_pack_updater.h" |
| 53 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 55 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 54 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" | 56 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" |
| 55 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" | 57 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" |
| 56 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 58 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
| 57 #include "chrome/browser/chromeos/policy/device_status_collector.h" | 59 #include "chrome/browser/chromeos/policy/device_status_collector.h" |
| 58 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" | 60 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" |
| 59 #include "chrome/browser/chromeos/policy/network_configuration_updater.h" | 61 #include "chrome/browser/chromeos/policy/network_configuration_updater.h" |
| 60 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" | 62 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
| 61 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" | 63 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h" |
| 62 #include "chrome/browser/chromeos/settings/cros_settings.h" | 64 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 63 #include "chrome/browser/chromeos/settings/cros_settings_provider.h" | 65 #include "chrome/browser/chromeos/settings/cros_settings_provider.h" |
| 64 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 66 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 65 #include "chrome/browser/chromeos/system/statistics_provider.h" | 67 #include "chrome/browser/chromeos/system/statistics_provider.h" |
| 66 #include "chrome/browser/chromeos/system/timezone_settings.h" | 68 #include "chrome/browser/chromeos/system/timezone_settings.h" |
| 67 #include "chrome/browser/policy/cloud/resource_cache.h" | 69 #include "chrome/browser/policy/cloud/resource_cache.h" |
| 70 #include "chromeos/attestation/attestation_flow.h" |
| 71 #include "chromeos/cryptohome/async_method_caller.h" |
| 68 #include "chromeos/dbus/dbus_thread_manager.h" | 72 #include "chromeos/dbus/dbus_thread_manager.h" |
| 69 #else | 73 #else |
| 70 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" | 74 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" |
| 71 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" | 75 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
| 72 #endif | 76 #endif |
| 73 | 77 |
| 74 using content::BrowserThread; | 78 using content::BrowserThread; |
| 75 | 79 |
| 76 namespace policy { | 80 namespace policy { |
| 77 | 81 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 device_cloud_policy_manager_->Init(); | 185 device_cloud_policy_manager_->Init(); |
| 182 scoped_ptr<CloudPolicyClient::StatusProvider> status_provider( | 186 scoped_ptr<CloudPolicyClient::StatusProvider> status_provider( |
| 183 new DeviceStatusCollector( | 187 new DeviceStatusCollector( |
| 184 local_state_, | 188 local_state_, |
| 185 chromeos::system::StatisticsProvider::GetInstance(), | 189 chromeos::system::StatisticsProvider::GetInstance(), |
| 186 NULL)); | 190 NULL)); |
| 187 device_cloud_policy_manager_->Connect( | 191 device_cloud_policy_manager_->Connect( |
| 188 local_state_, | 192 local_state_, |
| 189 device_management_service_.get(), | 193 device_management_service_.get(), |
| 190 status_provider.Pass()); | 194 status_provider.Pass()); |
| 195 |
| 196 scoped_ptr<chromeos::attestation::ServerProxy> attestation_ca_client( |
| 197 new chromeos::attestation::AttestationCAClient()); |
| 198 scoped_ptr<chromeos::attestation::AttestationFlow> attestation_flow( |
| 199 new chromeos::attestation::AttestationFlow( |
| 200 cryptohome::AsyncMethodCaller::GetInstance(), |
| 201 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), |
| 202 attestation_ca_client.Pass())); |
| 203 attestation_policy_observer_.reset( |
| 204 new chromeos::attestation::AttestationPolicyObserver( |
| 205 chromeos::CrosSettings::Get(), |
| 206 device_cloud_policy_manager_.get(), |
| 207 attestation_flow.Pass())); |
| 191 } | 208 } |
| 192 | 209 |
| 193 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 210 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 194 if (!command_line->HasSwitch(switches::kDisableLocalAccounts)) { | 211 if (!command_line->HasSwitch(switches::kDisableLocalAccounts)) { |
| 195 device_local_account_policy_service_.reset( | 212 device_local_account_policy_service_.reset( |
| 196 new DeviceLocalAccountPolicyService( | 213 new DeviceLocalAccountPolicyService( |
| 197 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 214 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), |
| 198 chromeos::DeviceSettingsService::Get())); | 215 chromeos::DeviceSettingsService::Get())); |
| 199 device_local_account_policy_service_->Connect( | 216 device_local_account_policy_service_->Connect( |
| 200 device_management_service_.get()); | 217 device_management_service_.get()); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 224 // call SetPolicyProviderForTesting() again. It is still owned by the test. | 241 // call SetPolicyProviderForTesting() again. It is still owned by the test. |
| 225 g_testing_provider = NULL; | 242 g_testing_provider = NULL; |
| 226 if (platform_provider_) | 243 if (platform_provider_) |
| 227 platform_provider_->Shutdown(); | 244 platform_provider_->Shutdown(); |
| 228 | 245 |
| 229 #if defined(OS_CHROMEOS) | 246 #if defined(OS_CHROMEOS) |
| 230 // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|. | 247 // The AppPackUpdater may be observing the |device_cloud_policy_subsystem_|. |
| 231 // Delete it first. | 248 // Delete it first. |
| 232 app_pack_updater_.reset(); | 249 app_pack_updater_.reset(); |
| 233 | 250 |
| 251 attestation_policy_observer_.reset(); |
| 252 |
| 234 if (device_cloud_policy_manager_) | 253 if (device_cloud_policy_manager_) |
| 235 device_cloud_policy_manager_->Shutdown(); | 254 device_cloud_policy_manager_->Shutdown(); |
| 236 if (device_local_account_policy_provider_) | 255 if (device_local_account_policy_provider_) |
| 237 device_local_account_policy_provider_->Shutdown(); | 256 device_local_account_policy_provider_->Shutdown(); |
| 238 if (device_local_account_policy_service_) | 257 if (device_local_account_policy_service_) |
| 239 device_local_account_policy_service_->Disconnect(); | 258 device_local_account_policy_service_->Disconnect(); |
| 240 if (user_cloud_policy_manager_) | 259 if (user_cloud_policy_manager_) |
| 241 user_cloud_policy_manager_->Shutdown(); | 260 user_cloud_policy_manager_->Shutdown(); |
| 242 global_user_cloud_policy_provider_.Shutdown(); | 261 global_user_cloud_policy_provider_.Shutdown(); |
| 243 #endif | 262 #endif |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 return new AsyncPolicyProvider(loader.Pass()); | 571 return new AsyncPolicyProvider(loader.Pass()); |
| 553 } else { | 572 } else { |
| 554 return NULL; | 573 return NULL; |
| 555 } | 574 } |
| 556 #else | 575 #else |
| 557 return NULL; | 576 return NULL; |
| 558 #endif | 577 #endif |
| 559 } | 578 } |
| 560 | 579 |
| 561 } // namespace policy | 580 } // namespace policy |
| OLD | NEW |