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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 Initializer* Initializer::instance_ = nullptr; | 44 Initializer* Initializer::instance_ = nullptr; |
| 45 | 45 |
| 46 // static | 46 // static |
| 47 void Initializer::Init( | 47 void Initializer::Init( |
| 48 cryptauth::CryptAuthService* cryptauth_service, | 48 cryptauth::CryptAuthService* cryptauth_service, |
| 49 std::unique_ptr<NotificationPresenter> notification_presenter, | 49 std::unique_ptr<NotificationPresenter> notification_presenter, |
| 50 PrefService* pref_service, | 50 PrefService* pref_service, |
| 51 ProfileOAuth2TokenService* token_service, | 51 ProfileOAuth2TokenService* token_service, |
| 52 NetworkStateHandler* network_state_handler, | 52 NetworkStateHandler* network_state_handler, |
| 53 NetworkConnect* network_connect) { | 53 NetworkConnect* network_connect) { |
| 54 if (!device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable()) { | 54 if (!device::BluetoothAdapterFactory::IsBluetoothSupported()) { |
| 55 PA_LOG(WARNING) << "Bluetooth is unavailable on this device; cannot " | 55 PA_LOG(WARNING) << "Bluetooth is unavailable on this device; cannot " |
|
Kyle Horimoto
2017/04/13 01:55:36
nit: Change log as well.
ortuno
2017/04/18 01:25:42
Done.
| |
| 56 << "initialize tether feature."; | 56 << "initialize tether feature."; |
| 57 return; | 57 return; |
| 58 } | 58 } |
| 59 | 59 |
| 60 if (instance_) { | 60 if (instance_) { |
| 61 PA_LOG(WARNING) << "Tether initialization was triggered when the feature " | 61 PA_LOG(WARNING) << "Tether initialization was triggered when the feature " |
| 62 << "had already been initialized; exiting initialization " | 62 << "had already been initialized; exiting initialization " |
| 63 << "early."; | 63 << "early."; |
| 64 return; | 64 return; |
| 65 } | 65 } |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 | 191 |
| 192 void Initializer::OnBluetoothAdapterAdvertisingIntervalError( | 192 void Initializer::OnBluetoothAdapterAdvertisingIntervalError( |
| 193 device::BluetoothAdvertisement::ErrorCode status) { | 193 device::BluetoothAdvertisement::ErrorCode status) { |
| 194 PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; " | 194 PA_LOG(ERROR) << "Failed to set Bluetooth advertisement interval; " |
| 195 << "cannot use tether feature. Error code: " << status; | 195 << "cannot use tether feature. Error code: " << status; |
| 196 } | 196 } |
| 197 | 197 |
| 198 } // namespace tether | 198 } // namespace tether |
| 199 | 199 |
| 200 } // namespace chromeos | 200 } // namespace chromeos |
| OLD | NEW |