| 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 | 212 |
| 213 SetTimezoneIfPolicyAvailable(); | 213 SetTimezoneIfPolicyAvailable(); |
| 214 | 214 |
| 215 network_configuration_updater_ = | 215 network_configuration_updater_ = |
| 216 DeviceNetworkConfigurationUpdater::CreateForDevicePolicy( | 216 DeviceNetworkConfigurationUpdater::CreateForDevicePolicy( |
| 217 GetPolicyService(), | 217 GetPolicyService(), |
| 218 chromeos::NetworkHandler::Get() | 218 chromeos::NetworkHandler::Get() |
| 219 ->managed_network_configuration_handler(), | 219 ->managed_network_configuration_handler(), |
| 220 chromeos::NetworkHandler::Get()->network_device_handler(), | 220 chromeos::NetworkHandler::Get()->network_device_handler(), |
| 221 chromeos::CrosSettings::Get()); | 221 chromeos::CrosSettings::Get()); |
| 222 |
| 223 bluetooth_policy_handler_.reset( |
| 224 new chromeos::BluetoothPolicyHandler(chromeos::CrosSettings::Get())); |
| 222 } | 225 } |
| 223 | 226 |
| 224 void BrowserPolicyConnectorChromeOS::PreShutdown() { | 227 void BrowserPolicyConnectorChromeOS::PreShutdown() { |
| 225 // Let the |affiliated_invalidation_service_provider_| unregister itself as an | 228 // Let the |affiliated_invalidation_service_provider_| unregister itself as an |
| 226 // observer of per-Profile InvalidationServices and the device-global | 229 // observer of per-Profile InvalidationServices and the device-global |
| 227 // invalidation::TiclInvalidationService it may have created as an observer of | 230 // invalidation::TiclInvalidationService it may have created as an observer of |
| 228 // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called. | 231 // the DeviceOAuth2TokenService that is destroyed before Shutdown() is called. |
| 229 if (affiliated_invalidation_service_provider_) | 232 if (affiliated_invalidation_service_provider_) |
| 230 affiliated_invalidation_service_provider_->Shutdown(); | 233 affiliated_invalidation_service_provider_->Shutdown(); |
| 231 } | 234 } |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 device_cloud_policy_manager_->device_store()->policy(); | 384 device_cloud_policy_manager_->device_store()->policy(); |
| 382 if (policy_data) { | 385 if (policy_data) { |
| 383 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), | 386 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), |
| 384 policy_data->device_affiliation_ids().end()); | 387 policy_data->device_affiliation_ids().end()); |
| 385 } | 388 } |
| 386 } | 389 } |
| 387 return affiliation_ids; | 390 return affiliation_ids; |
| 388 } | 391 } |
| 389 | 392 |
| 390 } // namespace policy | 393 } // namespace policy |
| OLD | NEW |