Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/dbus/dbus_thread_manager.h" | 5 #include "chromeos/dbus/dbus_thread_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/sys_info.h" | 8 #include "base/sys_info.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "chromeos/chromeos_switches.h" | 10 #include "chromeos/chromeos_switches.h" |
| 11 #include "chromeos/dbus/amplifier_client.h" | 11 #include "chromeos/dbus/amplifier_client.h" |
| 12 #include "chromeos/dbus/ap_manager_client.h" | 12 #include "chromeos/dbus/ap_manager_client.h" |
| 13 #include "chromeos/dbus/audio_dsp_client.h" | 13 #include "chromeos/dbus/audio_dsp_client.h" |
| 14 #include "chromeos/dbus/bluetooth_adapter_client.h" | 14 #include "chromeos/dbus/bluetooth_adapter_client.h" |
| 15 #include "chromeos/dbus/bluetooth_agent_manager_client.h" | 15 #include "chromeos/dbus/bluetooth_agent_manager_client.h" |
| 16 #include "chromeos/dbus/bluetooth_device_client.h" | 16 #include "chromeos/dbus/bluetooth_device_client.h" |
| 17 #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h" | 17 #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h" |
| 18 #include "chromeos/dbus/bluetooth_gatt_descriptor_client.h" | 18 #include "chromeos/dbus/bluetooth_gatt_descriptor_client.h" |
| 19 #include "chromeos/dbus/bluetooth_gatt_manager_client.h" | 19 #include "chromeos/dbus/bluetooth_gatt_manager_client.h" |
| 20 #include "chromeos/dbus/bluetooth_gatt_service_client.h" | 20 #include "chromeos/dbus/bluetooth_gatt_service_client.h" |
| 21 #include "chromeos/dbus/bluetooth_input_client.h" | 21 #include "chromeos/dbus/bluetooth_input_client.h" |
| 22 #include "chromeos/dbus/bluetooth_le_advertising_manager_client.h" | |
| 22 #include "chromeos/dbus/bluetooth_media_client.h" | 23 #include "chromeos/dbus/bluetooth_media_client.h" |
| 23 #include "chromeos/dbus/bluetooth_media_transport_client.h" | 24 #include "chromeos/dbus/bluetooth_media_transport_client.h" |
| 24 #include "chromeos/dbus/bluetooth_profile_manager_client.h" | 25 #include "chromeos/dbus/bluetooth_profile_manager_client.h" |
| 25 #include "chromeos/dbus/cras_audio_client.h" | 26 #include "chromeos/dbus/cras_audio_client.h" |
| 26 #include "chromeos/dbus/cros_disks_client.h" | 27 #include "chromeos/dbus/cros_disks_client.h" |
| 27 #include "chromeos/dbus/cryptohome_client.h" | 28 #include "chromeos/dbus/cryptohome_client.h" |
| 28 #include "chromeos/dbus/dbus_client.h" | 29 #include "chromeos/dbus/dbus_client.h" |
| 29 #include "chromeos/dbus/debug_daemon_client.h" | 30 #include "chromeos/dbus/debug_daemon_client.h" |
| 30 #include "chromeos/dbus/easy_unlock_client.h" | 31 #include "chromeos/dbus/easy_unlock_client.h" |
| 31 #include "chromeos/dbus/gsm_sms_client.h" | 32 #include "chromeos/dbus/gsm_sms_client.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 } | 126 } |
| 126 | 127 |
| 127 AudioDspClient* DBusThreadManager::GetAudioDspClient() { | 128 AudioDspClient* DBusThreadManager::GetAudioDspClient() { |
| 128 return client_bundle_->audio_dsp_client(); | 129 return client_bundle_->audio_dsp_client(); |
| 129 } | 130 } |
| 130 | 131 |
| 131 BluetoothAdapterClient* DBusThreadManager::GetBluetoothAdapterClient() { | 132 BluetoothAdapterClient* DBusThreadManager::GetBluetoothAdapterClient() { |
| 132 return client_bundle_->bluetooth_adapter_client(); | 133 return client_bundle_->bluetooth_adapter_client(); |
| 133 } | 134 } |
| 134 | 135 |
| 136 BluetoothLEAdvertisingManagerClient* | |
| 137 DBusThreadManager::GetBluetoothLEAdvertisingManagerClient() { | |
| 138 return client_bundle_->bluetooth_le_advertising_manager_client(); | |
| 139 } | |
| 140 | |
| 135 BluetoothAgentManagerClient* | 141 BluetoothAgentManagerClient* |
| 136 DBusThreadManager::GetBluetoothAgentManagerClient() { | 142 DBusThreadManager::GetBluetoothAgentManagerClient() { |
| 137 return client_bundle_->bluetooth_agent_manager_client(); | 143 return client_bundle_->bluetooth_agent_manager_client(); |
| 138 } | 144 } |
| 139 | 145 |
| 140 BluetoothDeviceClient* DBusThreadManager::GetBluetoothDeviceClient() { | 146 BluetoothDeviceClient* DBusThreadManager::GetBluetoothDeviceClient() { |
| 141 return client_bundle_->bluetooth_device_client(); | 147 return client_bundle_->bluetooth_device_client(); |
| 142 } | 148 } |
| 143 | 149 |
| 144 BluetoothGattCharacteristicClient* | 150 BluetoothGattCharacteristicClient* |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 scoped_ptr<AudioDspClient> client) { | 487 scoped_ptr<AudioDspClient> client) { |
| 482 DBusThreadManager::Get()->client_bundle_->audio_dsp_client_ = client.Pass(); | 488 DBusThreadManager::Get()->client_bundle_->audio_dsp_client_ = client.Pass(); |
| 483 } | 489 } |
| 484 | 490 |
| 485 void DBusThreadManagerSetter::SetBluetoothAdapterClient( | 491 void DBusThreadManagerSetter::SetBluetoothAdapterClient( |
| 486 scoped_ptr<BluetoothAdapterClient> client) { | 492 scoped_ptr<BluetoothAdapterClient> client) { |
| 487 DBusThreadManager::Get()->client_bundle_->bluetooth_adapter_client_ = | 493 DBusThreadManager::Get()->client_bundle_->bluetooth_adapter_client_ = |
| 488 client.Pass(); | 494 client.Pass(); |
| 489 } | 495 } |
| 490 | 496 |
| 497 void DBusThreadManagerSetter::SetBluetoothLEAdvertisingManagerClient( | |
| 498 scoped_ptr<BluetoothLEAdvertisingManagerClient> client) { | |
| 499 DBusThreadManager::Get() | |
| 500 ->client_bundle_->bluetooth_le_advertising_manager_client_ = | |
| 501 client.Pass(); | |
|
armansito
2015/04/15 23:56:49
nit: Did git cl format output this? it hurts my ey
rkc
2015/04/16 18:13:05
Yep. I always do a git cl format before git cl upl
armansito
2015/04/16 18:42:09
My eyes are still bleeding though. Make it nicer i
rkc
2015/04/16 18:49:58
Changed it to match how bluetooth_gatt_characteris
| |
| 502 } | |
| 503 | |
| 491 void DBusThreadManagerSetter::SetBluetoothAgentManagerClient( | 504 void DBusThreadManagerSetter::SetBluetoothAgentManagerClient( |
| 492 scoped_ptr<BluetoothAgentManagerClient> client) { | 505 scoped_ptr<BluetoothAgentManagerClient> client) { |
| 493 DBusThreadManager::Get()->client_bundle_->bluetooth_agent_manager_client_ = | 506 DBusThreadManager::Get()->client_bundle_->bluetooth_agent_manager_client_ = |
| 494 client.Pass(); | 507 client.Pass(); |
| 495 } | 508 } |
| 496 | 509 |
| 497 void DBusThreadManagerSetter::SetBluetoothDeviceClient( | 510 void DBusThreadManagerSetter::SetBluetoothDeviceClient( |
| 498 scoped_ptr<BluetoothDeviceClient> client) { | 511 scoped_ptr<BluetoothDeviceClient> client) { |
| 499 DBusThreadManager::Get()->client_bundle_->bluetooth_device_client_ = | 512 DBusThreadManager::Get()->client_bundle_->bluetooth_device_client_ = |
| 500 client.Pass(); | 513 client.Pass(); |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 715 client.Pass(); | 728 client.Pass(); |
| 716 } | 729 } |
| 717 | 730 |
| 718 void DBusThreadManagerSetter::SetUpdateEngineClient( | 731 void DBusThreadManagerSetter::SetUpdateEngineClient( |
| 719 scoped_ptr<UpdateEngineClient> client) { | 732 scoped_ptr<UpdateEngineClient> client) { |
| 720 DBusThreadManager::Get()->client_bundle_->update_engine_client_ = | 733 DBusThreadManager::Get()->client_bundle_->update_engine_client_ = |
| 721 client.Pass(); | 734 client.Pass(); |
| 722 } | 735 } |
| 723 | 736 |
| 724 } // namespace chromeos | 737 } // namespace chromeos |
| OLD | NEW |