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