| 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 <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 BluetoothAdapterClient::Create(client_type)); | 242 BluetoothAdapterClient::Create(client_type)); |
| 243 bluetooth_agent_manager_client_.reset( | 243 bluetooth_agent_manager_client_.reset( |
| 244 BluetoothAgentManagerClient::Create(client_type)); | 244 BluetoothAgentManagerClient::Create(client_type)); |
| 245 bluetooth_device_client_.reset(BluetoothDeviceClient::Create(client_type)); | 245 bluetooth_device_client_.reset(BluetoothDeviceClient::Create(client_type)); |
| 246 bluetooth_input_client_.reset(BluetoothInputClient::Create(client_type)); | 246 bluetooth_input_client_.reset(BluetoothInputClient::Create(client_type)); |
| 247 bluetooth_profile_manager_client_.reset( | 247 bluetooth_profile_manager_client_.reset( |
| 248 BluetoothProfileManagerClient::Create(client_type)); | 248 BluetoothProfileManagerClient::Create(client_type)); |
| 249 cras_audio_client_.reset(CrasAudioClient::Create(client_type)); | 249 cras_audio_client_.reset(CrasAudioClient::Create(client_type)); |
| 250 cros_disks_client_.reset(CrosDisksClient::Create(client_type)); | 250 cros_disks_client_.reset(CrosDisksClient::Create(client_type)); |
| 251 cryptohome_client_.reset(CryptohomeClient::Create(client_type)); | 251 cryptohome_client_.reset(CryptohomeClient::Create(client_type)); |
| 252 debug_daemon_client_.reset(DebugDaemonClient::Create(client_type)); | 252 debug_daemon_client_.reset(DebugDaemonClient::Create()); |
| 253 shill_manager_client_.reset( | 253 shill_manager_client_.reset( |
| 254 ShillManagerClient::Create(client_type_override)); | 254 ShillManagerClient::Create(client_type_override)); |
| 255 shill_device_client_.reset( | 255 shill_device_client_.reset( |
| 256 ShillDeviceClient::Create(client_type_override)); | 256 ShillDeviceClient::Create(client_type_override)); |
| 257 shill_ipconfig_client_.reset( | 257 shill_ipconfig_client_.reset( |
| 258 ShillIPConfigClient::Create(client_type_override)); | 258 ShillIPConfigClient::Create(client_type_override)); |
| 259 shill_service_client_.reset( | 259 shill_service_client_.reset( |
| 260 ShillServiceClient::Create(client_type_override)); | 260 ShillServiceClient::Create(client_type_override)); |
| 261 shill_profile_client_.reset( | 261 shill_profile_client_.reset( |
| 262 ShillProfileClient::Create(client_type_override)); | 262 ShillProfileClient::Create(client_type_override)); |
| 263 gsm_sms_client_.reset(GsmSMSClient::Create(client_type_override)); | 263 gsm_sms_client_.reset(GsmSMSClient::Create(client_type_override)); |
| 264 image_burner_client_.reset(ImageBurnerClient::Create(client_type)); | 264 image_burner_client_.reset(ImageBurnerClient::Create(client_type)); |
| 265 introspectable_client_.reset(IntrospectableClient::Create(client_type)); | 265 introspectable_client_.reset(IntrospectableClient::Create()); |
| 266 modem_messaging_client_.reset(ModemMessagingClient::Create(client_type)); | 266 modem_messaging_client_.reset(ModemMessagingClient::Create()); |
| 267 // Create the NFC clients in the correct order based on their dependencies. | 267 // Create the NFC clients in the correct order based on their dependencies. |
| 268 nfc_manager_client_.reset(NfcManagerClient::Create(client_type)); | 268 nfc_manager_client_.reset(NfcManagerClient::Create(client_type)); |
| 269 nfc_adapter_client_.reset( | 269 nfc_adapter_client_.reset( |
| 270 NfcAdapterClient::Create(client_type, nfc_manager_client_.get())); | 270 NfcAdapterClient::Create(client_type, nfc_manager_client_.get())); |
| 271 nfc_device_client_.reset( | 271 nfc_device_client_.reset( |
| 272 NfcDeviceClient::Create(client_type, nfc_adapter_client_.get())); | 272 NfcDeviceClient::Create(client_type, nfc_adapter_client_.get())); |
| 273 nfc_tag_client_.reset( | 273 nfc_tag_client_.reset( |
| 274 NfcTagClient::Create(client_type, nfc_adapter_client_.get())); | 274 NfcTagClient::Create(client_type, nfc_adapter_client_.get())); |
| 275 nfc_record_client_.reset( | 275 nfc_record_client_.reset( |
| 276 NfcRecordClient::Create( | 276 NfcRecordClient::Create( |
| 277 client_type, nfc_device_client_.get(), nfc_tag_client_.get())); | 277 client_type, nfc_device_client_.get(), nfc_tag_client_.get())); |
| 278 permission_broker_client_.reset( | 278 permission_broker_client_.reset(PermissionBrokerClient::Create()); |
| 279 PermissionBrokerClient::Create(client_type)); | |
| 280 power_manager_client_.reset( | 279 power_manager_client_.reset( |
| 281 PowerManagerClient::Create(client_type_override)); | 280 PowerManagerClient::Create(client_type_override)); |
| 282 session_manager_client_.reset(SessionManagerClient::Create(client_type)); | 281 session_manager_client_.reset(SessionManagerClient::Create(client_type)); |
| 283 sms_client_.reset(SMSClient::Create(client_type)); | 282 sms_client_.reset(SMSClient::Create()); |
| 284 system_clock_client_.reset(SystemClockClient::Create(client_type)); | 283 system_clock_client_.reset(SystemClockClient::Create(client_type)); |
| 285 update_engine_client_.reset(UpdateEngineClient::Create(client_type)); | 284 update_engine_client_.reset(UpdateEngineClient::Create(client_type)); |
| 286 | 285 |
| 287 power_policy_controller_.reset(new PowerPolicyController); | 286 power_policy_controller_.reset(new PowerPolicyController); |
| 288 } | 287 } |
| 289 | 288 |
| 290 // Note: Keep this before other members so they can call AddObserver() in | 289 // Note: Keep this before other members so they can call AddObserver() in |
| 291 // their c'tors. | 290 // their c'tors. |
| 292 ObserverList<DBusThreadManagerObserver> observers_; | 291 ObserverList<DBusThreadManagerObserver> observers_; |
| 293 | 292 |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 g_dbus_thread_manager->GetSystemBus()->GetManagedObjects(); | 460 g_dbus_thread_manager->GetSystemBus()->GetManagedObjects(); |
| 462 } | 461 } |
| 463 | 462 |
| 464 // static | 463 // static |
| 465 void DBusThreadManager::InitClient(DBusClient* client) { | 464 void DBusThreadManager::InitClient(DBusClient* client) { |
| 466 if (client) | 465 if (client) |
| 467 client->Init(g_dbus_thread_manager->GetSystemBus()); | 466 client->Init(g_dbus_thread_manager->GetSystemBus()); |
| 468 } | 467 } |
| 469 | 468 |
| 470 } // namespace chromeos | 469 } // namespace chromeos |
| OLD | NEW |