Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chromeos/components/tether/initializer.h" | 5 #include "chromeos/components/tether/initializer.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "chromeos/components/tether/active_host.h" | 8 #include "chromeos/components/tether/active_host.h" |
| 9 #include "chromeos/components/tether/active_host_network_state_updater.h" | 9 #include "chromeos/components/tether/active_host_network_state_updater.h" |
| 10 #include "chromeos/components/tether/ble_connection_manager.h" | 10 #include "chromeos/components/tether/ble_connection_manager.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 base::MakeUnique<LocalDeviceDataProvider>(cryptauth_service_); | 174 base::MakeUnique<LocalDeviceDataProvider>(cryptauth_service_); |
| 175 remote_beacon_seed_fetcher_ = | 175 remote_beacon_seed_fetcher_ = |
| 176 base::MakeUnique<cryptauth::RemoteBeaconSeedFetcher>( | 176 base::MakeUnique<cryptauth::RemoteBeaconSeedFetcher>( |
| 177 cryptauth_service_->GetCryptAuthDeviceManager()); | 177 cryptauth_service_->GetCryptAuthDeviceManager()); |
| 178 ble_connection_manager_ = base::MakeUnique<BleConnectionManager>( | 178 ble_connection_manager_ = base::MakeUnique<BleConnectionManager>( |
| 179 cryptauth_service_, adapter, local_device_data_provider_.get(), | 179 cryptauth_service_, adapter, local_device_data_provider_.get(), |
| 180 remote_beacon_seed_fetcher_.get(), | 180 remote_beacon_seed_fetcher_.get(), |
| 181 cryptauth::BluetoothThrottlerImpl::GetInstance()); | 181 cryptauth::BluetoothThrottlerImpl::GetInstance()); |
| 182 host_scan_device_prioritizer_ = | 182 host_scan_device_prioritizer_ = |
| 183 base::MakeUnique<HostScanDevicePrioritizer>(pref_service_); | 183 base::MakeUnique<HostScanDevicePrioritizer>(pref_service_); |
| 184 wifi_hotspot_connector_ = base::MakeUnique<WifiHotspotConnector>( | |
| 185 network_state_handler_, network_connect_); | |
| 186 active_host_ = | 184 active_host_ = |
| 187 base::MakeUnique<ActiveHost>(tether_host_fetcher_.get(), pref_service_); | 185 base::MakeUnique<ActiveHost>(tether_host_fetcher_.get(), pref_service_); |
| 186 wifi_hotspot_connector_ = base::MakeUnique<WifiHotspotConnector>( | |
|
Kyle Horimoto
2017/04/27 01:28:07
Revert changes in this file when you no longer nee
lesliewatkins
2017/04/28 21:30:43
Done.
| |
| 187 network_state_handler_, network_connect_, active_host_.get()); | |
| 188 active_host_network_state_updater_ = | 188 active_host_network_state_updater_ = |
| 189 base::MakeUnique<ActiveHostNetworkStateUpdater>(active_host_.get(), | 189 base::MakeUnique<ActiveHostNetworkStateUpdater>(active_host_.get(), |
| 190 network_state_handler_); | 190 network_state_handler_); |
| 191 device_id_tether_network_guid_map_ = | 191 device_id_tether_network_guid_map_ = |
| 192 base::MakeUnique<DeviceIdTetherNetworkGuidMap>(); | 192 base::MakeUnique<DeviceIdTetherNetworkGuidMap>(); |
| 193 tether_connector_ = base::MakeUnique<TetherConnector>( | 193 tether_connector_ = base::MakeUnique<TetherConnector>( |
| 194 network_connection_handler_, network_state_handler_, | 194 network_connection_handler_, network_state_handler_, |
| 195 wifi_hotspot_connector_.get(), active_host_.get(), | 195 wifi_hotspot_connector_.get(), active_host_.get(), |
| 196 tether_host_fetcher_.get(), ble_connection_manager_.get(), | 196 tether_host_fetcher_.get(), ble_connection_manager_.get(), |
| 197 host_scan_device_prioritizer_.get(), | 197 host_scan_device_prioritizer_.get(), |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 215 | 215 |
| 216 void Initializer::OnBluetoothAdapterAdvertisingIntervalError( | 216 void Initializer::OnBluetoothAdapterAdvertisingIntervalError( |
| 217 device::BluetoothAdvertisement::ErrorCode status) { | 217 device::BluetoothAdvertisement::ErrorCode status) { |
| 218 PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; " | 218 PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; " |
| 219 << "cannot use tether feature. Error code: " << status; | 219 << "cannot use tether feature. Error code: " << status; |
| 220 } | 220 } |
| 221 | 221 |
| 222 } // namespace tether | 222 } // namespace tether |
| 223 | 223 |
| 224 } // namespace chromeos | 224 } // namespace chromeos |
| OLD | NEW |