| 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/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
| 8 #include "base/threading/thread.h" | 8 #include "base/threading/thread.h" |
| 9 #include "chromeos/dbus/bluetooth_adapter_client.h" | 9 #include "chromeos/dbus/bluetooth_adapter_client.h" |
| 10 #include "chromeos/dbus/bluetooth_device_client.h" | 10 #include "chromeos/dbus/bluetooth_device_client.h" |
| 11 #include "chromeos/dbus/bluetooth_input_client.h" | 11 #include "chromeos/dbus/bluetooth_input_client.h" |
| 12 #include "chromeos/dbus/bluetooth_manager_client.h" | 12 #include "chromeos/dbus/bluetooth_manager_client.h" |
| 13 #include "chromeos/dbus/bluetooth_node_client.h" | 13 #include "chromeos/dbus/bluetooth_node_client.h" |
| 14 #include "chromeos/dbus/cashew_client.h" | 14 #include "chromeos/dbus/cashew_client.h" |
| 15 #include "chromeos/dbus/cros_disks_client.h" | 15 #include "chromeos/dbus/cros_disks_client.h" |
| 16 #include "chromeos/dbus/cryptohome_client.h" | 16 #include "chromeos/dbus/cryptohome_client.h" |
| 17 #include "chromeos/dbus/dbus_client_implementation_type.h" | 17 #include "chromeos/dbus/dbus_client_implementation_type.h" |
| 18 #include "chromeos/dbus/debug_daemon_client.h" | 18 #include "chromeos/dbus/debug_daemon_client.h" |
| 19 #include "chromeos/dbus/flimflam_device_client.h" |
| 19 #include "chromeos/dbus/flimflam_ipconfig_client.h" | 20 #include "chromeos/dbus/flimflam_ipconfig_client.h" |
| 20 #include "chromeos/dbus/flimflam_manager_client.h" | 21 #include "chromeos/dbus/flimflam_manager_client.h" |
| 21 #include "chromeos/dbus/flimflam_network_client.h" | 22 #include "chromeos/dbus/flimflam_network_client.h" |
| 22 #include "chromeos/dbus/flimflam_profile_client.h" | 23 #include "chromeos/dbus/flimflam_profile_client.h" |
| 23 #include "chromeos/dbus/image_burner_client.h" | 24 #include "chromeos/dbus/image_burner_client.h" |
| 24 #include "chromeos/dbus/introspectable_client.h" | 25 #include "chromeos/dbus/introspectable_client.h" |
| 25 #include "chromeos/dbus/power_manager_client.h" | 26 #include "chromeos/dbus/power_manager_client.h" |
| 26 #include "chromeos/dbus/session_manager_client.h" | 27 #include "chromeos/dbus/session_manager_client.h" |
| 27 #include "chromeos/dbus/speech_synthesizer_client.h" | 28 #include "chromeos/dbus/speech_synthesizer_client.h" |
| 28 #include "chromeos/dbus/update_engine_client.h" | 29 #include "chromeos/dbus/update_engine_client.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 cashew_client_.reset(CashewClient::Create(client_type, system_bus_.get())); | 71 cashew_client_.reset(CashewClient::Create(client_type, system_bus_.get())); |
| 71 // Create the cros-disks client. | 72 // Create the cros-disks client. |
| 72 cros_disks_client_.reset( | 73 cros_disks_client_.reset( |
| 73 CrosDisksClient::Create(client_type, system_bus_.get())); | 74 CrosDisksClient::Create(client_type, system_bus_.get())); |
| 74 // Create the Cryptohome client. | 75 // Create the Cryptohome client. |
| 75 cryptohome_client_.reset( | 76 cryptohome_client_.reset( |
| 76 CryptohomeClient::Create(client_type, system_bus_.get())); | 77 CryptohomeClient::Create(client_type, system_bus_.get())); |
| 77 // Create the debugdaemon client. | 78 // Create the debugdaemon client. |
| 78 debugdaemon_client_.reset( | 79 debugdaemon_client_.reset( |
| 79 DebugDaemonClient::Create(client_type, system_bus_.get())); | 80 DebugDaemonClient::Create(client_type, system_bus_.get())); |
| 81 // Create the Flimflam Device client. |
| 82 flimflam_device_client_.reset( |
| 83 FlimflamDeviceClient::Create(client_type, system_bus_.get())); |
| 80 // Create the Flimflam IPConfig client. | 84 // Create the Flimflam IPConfig client. |
| 81 flimflam_ipconfig_client_.reset( | 85 flimflam_ipconfig_client_.reset( |
| 82 FlimflamIPConfigClient::Create(client_type, system_bus_.get())); | 86 FlimflamIPConfigClient::Create(client_type, system_bus_.get())); |
| 83 // Create the Flimflam Manager client. | 87 // Create the Flimflam Manager client. |
| 84 flimflam_manager_client_.reset( | 88 flimflam_manager_client_.reset( |
| 85 FlimflamManagerClient::Create(client_type, system_bus_.get())); | 89 FlimflamManagerClient::Create(client_type, system_bus_.get())); |
| 86 // Create the Flimflam Network client. | 90 // Create the Flimflam Network client. |
| 87 flimflam_network_client_.reset( | 91 flimflam_network_client_.reset( |
| 88 FlimflamNetworkClient::Create(client_type, system_bus_.get())); | 92 FlimflamNetworkClient::Create(client_type, system_bus_.get())); |
| 89 // Create the Flimflam Profile client. | 93 // Create the Flimflam Profile client. |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE { | 166 virtual CryptohomeClient* GetCryptohomeClient() OVERRIDE { |
| 163 return cryptohome_client_.get(); | 167 return cryptohome_client_.get(); |
| 164 } | 168 } |
| 165 | 169 |
| 166 // DBusThreadManager override. | 170 // DBusThreadManager override. |
| 167 virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE { | 171 virtual DebugDaemonClient* GetDebugDaemonClient() OVERRIDE { |
| 168 return debugdaemon_client_.get(); | 172 return debugdaemon_client_.get(); |
| 169 } | 173 } |
| 170 | 174 |
| 171 // DBusThreadManager override. | 175 // DBusThreadManager override. |
| 176 virtual FlimflamDeviceClient* GetFlimflamDeviceClient() OVERRIDE { |
| 177 return flimflam_device_client_.get(); |
| 178 } |
| 179 |
| 180 // DBusThreadManager override. |
| 172 virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE { | 181 virtual FlimflamIPConfigClient* GetFlimflamIPConfigClient() OVERRIDE { |
| 173 return flimflam_ipconfig_client_.get(); | 182 return flimflam_ipconfig_client_.get(); |
| 174 } | 183 } |
| 175 | 184 |
| 176 // DBusThreadManager override. | 185 // DBusThreadManager override. |
| 177 virtual FlimflamManagerClient* GetFlimflamManagerClient() OVERRIDE { | 186 virtual FlimflamManagerClient* GetFlimflamManagerClient() OVERRIDE { |
| 178 return flimflam_manager_client_.get(); | 187 return flimflam_manager_client_.get(); |
| 179 } | 188 } |
| 180 | 189 |
| 181 // DBusThreadManager override. | 190 // DBusThreadManager override. |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 scoped_refptr<dbus::Bus> system_bus_; | 231 scoped_refptr<dbus::Bus> system_bus_; |
| 223 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_; | 232 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_; |
| 224 scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_; | 233 scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_; |
| 225 scoped_ptr<BluetoothInputClient> bluetooth_input_client_; | 234 scoped_ptr<BluetoothInputClient> bluetooth_input_client_; |
| 226 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_; | 235 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_; |
| 227 scoped_ptr<BluetoothNodeClient> bluetooth_node_client_; | 236 scoped_ptr<BluetoothNodeClient> bluetooth_node_client_; |
| 228 scoped_ptr<CashewClient> cashew_client_; | 237 scoped_ptr<CashewClient> cashew_client_; |
| 229 scoped_ptr<CrosDisksClient> cros_disks_client_; | 238 scoped_ptr<CrosDisksClient> cros_disks_client_; |
| 230 scoped_ptr<CryptohomeClient> cryptohome_client_; | 239 scoped_ptr<CryptohomeClient> cryptohome_client_; |
| 231 scoped_ptr<DebugDaemonClient> debugdaemon_client_; | 240 scoped_ptr<DebugDaemonClient> debugdaemon_client_; |
| 241 scoped_ptr<FlimflamDeviceClient> flimflam_device_client_; |
| 232 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_; | 242 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_; |
| 233 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_; | 243 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_; |
| 234 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_; | 244 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_; |
| 235 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_; | 245 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_; |
| 236 scoped_ptr<ImageBurnerClient> image_burner_client_; | 246 scoped_ptr<ImageBurnerClient> image_burner_client_; |
| 237 scoped_ptr<IntrospectableClient> introspectable_client_; | 247 scoped_ptr<IntrospectableClient> introspectable_client_; |
| 238 scoped_ptr<PowerManagerClient> power_manager_client_; | 248 scoped_ptr<PowerManagerClient> power_manager_client_; |
| 239 scoped_ptr<SessionManagerClient> session_manager_client_; | 249 scoped_ptr<SessionManagerClient> session_manager_client_; |
| 240 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; | 250 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; |
| 241 scoped_ptr<UpdateEngineClient> update_engine_client_; | 251 scoped_ptr<UpdateEngineClient> update_engine_client_; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 } | 291 } |
| 282 | 292 |
| 283 // static | 293 // static |
| 284 DBusThreadManager* DBusThreadManager::Get() { | 294 DBusThreadManager* DBusThreadManager::Get() { |
| 285 CHECK(g_dbus_thread_manager) | 295 CHECK(g_dbus_thread_manager) |
| 286 << "DBusThreadManager::Get() called before Initialize()"; | 296 << "DBusThreadManager::Get() called before Initialize()"; |
| 287 return g_dbus_thread_manager; | 297 return g_dbus_thread_manager; |
| 288 } | 298 } |
| 289 | 299 |
| 290 } // namespace chromeos | 300 } // namespace chromeos |
| OLD | NEW |