| 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 27 matching lines...) Expand all Loading... |
| 38 #include "chrome/browser/chromeos/settings/install_attributes.h" | 38 #include "chrome/browser/chromeos/settings/install_attributes.h" |
| 39 #include "chrome/browser/policy/device_management_service_configuration.h" | 39 #include "chrome/browser/policy/device_management_service_configuration.h" |
| 40 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
| 41 #include "chromeos/attestation/attestation_flow.h" | 41 #include "chromeos/attestation/attestation_flow.h" |
| 42 #include "chromeos/chromeos_paths.h" | 42 #include "chromeos/chromeos_paths.h" |
| 43 #include "chromeos/chromeos_switches.h" | 43 #include "chromeos/chromeos_switches.h" |
| 44 #include "chromeos/cryptohome/async_method_caller.h" | 44 #include "chromeos/cryptohome/async_method_caller.h" |
| 45 #include "chromeos/cryptohome/system_salt_getter.h" | 45 #include "chromeos/cryptohome/system_salt_getter.h" |
| 46 #include "chromeos/dbus/cryptohome_client.h" | 46 #include "chromeos/dbus/cryptohome_client.h" |
| 47 #include "chromeos/dbus/dbus_thread_manager.h" | 47 #include "chromeos/dbus/dbus_thread_manager.h" |
| 48 #include "chromeos/dbus/upstart_client.h" |
| 48 #include "chromeos/network/network_handler.h" | 49 #include "chromeos/network/network_handler.h" |
| 49 #include "chromeos/network/onc/onc_certificate_importer_impl.h" | 50 #include "chromeos/network/onc/onc_certificate_importer_impl.h" |
| 50 #include "chromeos/settings/cros_settings_names.h" | 51 #include "chromeos/settings/cros_settings_names.h" |
| 51 #include "chromeos/settings/cros_settings_provider.h" | 52 #include "chromeos/settings/cros_settings_provider.h" |
| 52 #include "chromeos/settings/timezone_settings.h" | 53 #include "chromeos/settings/timezone_settings.h" |
| 53 #include "chromeos/system/statistics_provider.h" | 54 #include "chromeos/system/statistics_provider.h" |
| 54 #include "components/policy/core/common/cloud/cloud_policy_client.h" | 55 #include "components/policy/core/common/cloud/cloud_policy_client.h" |
| 55 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" | 56 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" |
| 56 #include "components/policy/core/common/proxy_policy_provider.h" | 57 #include "components/policy/core/common/proxy_policy_provider.h" |
| 57 #include "components/policy/proto/device_management_backend.pb.h" | 58 #include "components/policy/proto/device_management_backend.pb.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 &install_attrs_file)); | 104 &install_attrs_file)); |
| 104 install_attributes_->Init(install_attrs_file); | 105 install_attributes_->Init(install_attrs_file); |
| 105 } | 106 } |
| 106 | 107 |
| 107 std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store = | 108 std::unique_ptr<DeviceCloudPolicyStoreChromeOS> device_cloud_policy_store = |
| 108 base::MakeUnique<DeviceCloudPolicyStoreChromeOS>( | 109 base::MakeUnique<DeviceCloudPolicyStoreChromeOS>( |
| 109 chromeos::DeviceSettingsService::Get(), install_attributes_.get(), | 110 chromeos::DeviceSettingsService::Get(), install_attributes_.get(), |
| 110 GetBackgroundTaskRunner()); | 111 GetBackgroundTaskRunner()); |
| 111 | 112 |
| 112 if (install_attributes_->IsActiveDirectoryManaged()) { | 113 if (install_attributes_->IsActiveDirectoryManaged()) { |
| 114 chromeos::DBusThreadManager::Get() |
| 115 ->GetUpstartClient() |
| 116 ->StartAuthPolicyService(); |
| 117 |
| 113 device_active_directory_policy_manager_ = | 118 device_active_directory_policy_manager_ = |
| 114 new DeviceActiveDirectoryPolicyManager( | 119 new DeviceActiveDirectoryPolicyManager( |
| 115 std::move(device_cloud_policy_store)); | 120 std::move(device_cloud_policy_store)); |
| 116 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( | 121 AddPolicyProvider(base::WrapUnique<ConfigurationPolicyProvider>( |
| 117 device_active_directory_policy_manager_)); | 122 device_active_directory_policy_manager_)); |
| 118 } else { | 123 } else { |
| 119 state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>( | 124 state_keys_broker_ = base::MakeUnique<ServerBackedStateKeysBroker>( |
| 120 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), | 125 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(), |
| 121 base::ThreadTaskRunnerHandle::Get()); | 126 base::ThreadTaskRunnerHandle::Get()); |
| 122 | 127 |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 device_cloud_policy_manager_->device_store()->policy(); | 375 device_cloud_policy_manager_->device_store()->policy(); |
| 371 if (policy_data) { | 376 if (policy_data) { |
| 372 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 377 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
| 373 policy_data->device_affiliation_ids().end()); | 378 policy_data->device_affiliation_ids().end()); |
| 374 } | 379 } |
| 375 } | 380 } |
| 376 return affiliation_ids; | 381 return affiliation_ids; |
| 377 } | 382 } |
| 378 | 383 |
| 379 } // namespace policy | 384 } // namespace policy |
| OLD | NEW |