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" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/memory/ptr_util.h" |
15 #include "base/path_service.h" | 16 #include "base/path_service.h" |
16 #include "base/sequenced_task_runner.h" | 17 #include "base/sequenced_task_runner.h" |
17 #include "base/single_thread_task_runner.h" | 18 #include "base/single_thread_task_runner.h" |
18 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
19 #include "base/threading/sequenced_worker_pool.h" | 20 #include "base/threading/sequenced_worker_pool.h" |
20 #include "base/threading/thread_task_runner_handle.h" | 21 #include "base/threading/thread_task_runner_handle.h" |
| 22 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h" |
21 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" | 23 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" |
22 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide
r.h" | 24 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide
r.h" |
23 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide
r_impl.h" | 25 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide
r_impl.h" |
24 #include "chrome/browser/chromeos/policy/bluetooth_policy_handler.h" | 26 #include "chrome/browser/chromeos/policy/bluetooth_policy_handler.h" |
25 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" | 27 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" |
26 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" | 28 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" |
27 #include "chrome/browser/chromeos/policy/device_local_account.h" | 29 #include "chrome/browser/chromeos/policy/device_local_account.h" |
28 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 30 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
29 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" | 31 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" |
30 #include "chrome/browser/chromeos/policy/enrollment_config.h" | 32 #include "chrome/browser/chromeos/policy/enrollment_config.h" |
31 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" | 33 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" |
32 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma
nds_invalidator.h" | 34 #include "chrome/browser/chromeos/policy/remote_commands/affiliated_remote_comma
nds_invalidator.h" |
33 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" | 35 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" |
34 #include "chrome/browser/chromeos/settings/cros_settings.h" | 36 #include "chrome/browser/chromeos/settings/cros_settings.h" |
35 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 37 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
36 #include "chrome/browser/policy/device_management_service_configuration.h" | 38 #include "chrome/browser/policy/device_management_service_configuration.h" |
37 #include "chrome/common/pref_names.h" | 39 #include "chrome/common/pref_names.h" |
| 40 #include "chromeos/attestation/attestation_flow.h" |
38 #include "chromeos/chromeos_paths.h" | 41 #include "chromeos/chromeos_paths.h" |
39 #include "chromeos/chromeos_switches.h" | 42 #include "chromeos/chromeos_switches.h" |
40 #include "chromeos/cryptohome/async_method_caller.h" | 43 #include "chromeos/cryptohome/async_method_caller.h" |
41 #include "chromeos/cryptohome/system_salt_getter.h" | 44 #include "chromeos/cryptohome/system_salt_getter.h" |
42 #include "chromeos/dbus/cryptohome_client.h" | 45 #include "chromeos/dbus/cryptohome_client.h" |
43 #include "chromeos/dbus/dbus_thread_manager.h" | 46 #include "chromeos/dbus/dbus_thread_manager.h" |
44 #include "chromeos/network/network_handler.h" | 47 #include "chromeos/network/network_handler.h" |
45 #include "chromeos/network/onc/onc_certificate_importer_impl.h" | 48 #include "chromeos/network/onc/onc_certificate_importer_impl.h" |
46 #include "chromeos/settings/cros_settings_names.h" | 49 #include "chromeos/settings/cros_settings_names.h" |
47 #include "chromeos/settings/cros_settings_provider.h" | 50 #include "chromeos/settings/cros_settings_provider.h" |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 base::UTF8ToUTF16(timezone)); | 317 base::UTF8ToUTF16(timezone)); |
315 } | 318 } |
316 } | 319 } |
317 | 320 |
318 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() { | 321 void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() { |
319 device_cloud_policy_initializer_.reset(new DeviceCloudPolicyInitializer( | 322 device_cloud_policy_initializer_.reset(new DeviceCloudPolicyInitializer( |
320 local_state_, device_management_service(), GetBackgroundTaskRunner(), | 323 local_state_, device_management_service(), GetBackgroundTaskRunner(), |
321 install_attributes_.get(), state_keys_broker_.get(), | 324 install_attributes_.get(), state_keys_broker_.get(), |
322 device_cloud_policy_manager_->device_store(), | 325 device_cloud_policy_manager_->device_store(), |
323 device_cloud_policy_manager_, | 326 device_cloud_policy_manager_, |
| 327 cryptohome::AsyncMethodCaller::GetInstance(), CreateAttestationFlow())); |
| 328 device_cloud_policy_initializer_->Init(); |
| 329 } |
| 330 |
| 331 std::unique_ptr<chromeos::attestation::AttestationFlow> |
| 332 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() { |
| 333 return base::MakeUnique<chromeos::attestation::AttestationFlow>( |
324 cryptohome::AsyncMethodCaller::GetInstance(), | 334 cryptohome::AsyncMethodCaller::GetInstance(), |
325 chromeos::DBusThreadManager::Get()->GetCryptohomeClient())); | 335 chromeos::DBusThreadManager::Get()->GetCryptohomeClient(), |
326 device_cloud_policy_initializer_->Init(); | 336 base::MakeUnique<chromeos::attestation::AttestationCAClient>()); |
327 } | 337 } |
328 | 338 |
329 chromeos::AffiliationIDSet | 339 chromeos::AffiliationIDSet |
330 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const { | 340 BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const { |
331 chromeos::AffiliationIDSet affiliation_ids; | 341 chromeos::AffiliationIDSet affiliation_ids; |
332 if (device_cloud_policy_manager_) { | 342 if (device_cloud_policy_manager_) { |
333 const enterprise_management::PolicyData* const policy_data = | 343 const enterprise_management::PolicyData* const policy_data = |
334 device_cloud_policy_manager_->device_store()->policy(); | 344 device_cloud_policy_manager_->device_store()->policy(); |
335 if (policy_data) { | 345 if (policy_data) { |
336 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 346 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
337 policy_data->device_affiliation_ids().end()); | 347 policy_data->device_affiliation_ids().end()); |
338 } | 348 } |
339 } | 349 } |
340 return affiliation_ids; | 350 return affiliation_ids; |
341 } | 351 } |
342 | 352 |
343 } // namespace policy | 353 } // namespace policy |
OLD | NEW |