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> |
| 8 |
7 #include "base/chromeos/chromeos_version.h" | 9 #include "base/chromeos/chromeos_version.h" |
8 #include "base/command_line.h" | 10 #include "base/command_line.h" |
9 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
10 #include "chromeos/chromeos_switches.h" | 12 #include "chromeos/chromeos_switches.h" |
11 #include "chromeos/dbus/bluetooth_adapter_client.h" | 13 #include "chromeos/dbus/bluetooth_adapter_client.h" |
12 #include "chromeos/dbus/bluetooth_device_client.h" | 14 #include "chromeos/dbus/bluetooth_device_client.h" |
13 #include "chromeos/dbus/bluetooth_input_client.h" | 15 #include "chromeos/dbus/bluetooth_input_client.h" |
14 #include "chromeos/dbus/bluetooth_manager_client.h" | 16 #include "chromeos/dbus/bluetooth_manager_client.h" |
15 #include "chromeos/dbus/bluetooth_node_client.h" | 17 #include "chromeos/dbus/bluetooth_node_client.h" |
16 #include "chromeos/dbus/bluetooth_out_of_band_client.h" | 18 #include "chromeos/dbus/bluetooth_out_of_band_client.h" |
17 #include "chromeos/dbus/cashew_client.h" | 19 #include "chromeos/dbus/cashew_client.h" |
18 #include "chromeos/dbus/cros_disks_client.h" | 20 #include "chromeos/dbus/cros_disks_client.h" |
19 #include "chromeos/dbus/cryptohome_client.h" | 21 #include "chromeos/dbus/cryptohome_client.h" |
20 #include "chromeos/dbus/dbus_client_implementation_type.h" | 22 #include "chromeos/dbus/dbus_client_implementation_type.h" |
21 #include "chromeos/dbus/debug_daemon_client.h" | 23 #include "chromeos/dbus/debug_daemon_client.h" |
22 #include "chromeos/dbus/flimflam_device_client.h" | 24 #include "chromeos/dbus/flimflam_device_client.h" |
23 #include "chromeos/dbus/flimflam_ipconfig_client.h" | 25 #include "chromeos/dbus/flimflam_ipconfig_client.h" |
24 #include "chromeos/dbus/flimflam_manager_client.h" | 26 #include "chromeos/dbus/flimflam_manager_client.h" |
25 #include "chromeos/dbus/flimflam_network_client.h" | 27 #include "chromeos/dbus/flimflam_network_client.h" |
26 #include "chromeos/dbus/flimflam_profile_client.h" | 28 #include "chromeos/dbus/flimflam_profile_client.h" |
27 #include "chromeos/dbus/flimflam_service_client.h" | 29 #include "chromeos/dbus/flimflam_service_client.h" |
28 #include "chromeos/dbus/gsm_sms_client.h" | 30 #include "chromeos/dbus/gsm_sms_client.h" |
29 #include "chromeos/dbus/ibus/ibus_client.h" | 31 #include "chromeos/dbus/ibus/ibus_client.h" |
30 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" | 32 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" |
31 #include "chromeos/dbus/ibus/ibus_engine_service.h" | 33 #include "chromeos/dbus/ibus/ibus_engine_service.h" |
32 #include "chromeos/dbus/ibus/ibus_input_context_client.h" | 34 #include "chromeos/dbus/ibus/ibus_input_context_client.h" |
33 #include "chromeos/dbus/image_burner_client.h" | 35 #include "chromeos/dbus/image_burner_client.h" |
34 #include "chromeos/dbus/introspectable_client.h" | 36 #include "chromeos/dbus/introspectable_client.h" |
35 #include "chromeos/dbus/modem_messaging_client.h" | 37 #include "chromeos/dbus/modem_messaging_client.h" |
| 38 #include "chromeos/dbus/mtpd_client.h" |
36 #include "chromeos/dbus/power_manager_client.h" | 39 #include "chromeos/dbus/power_manager_client.h" |
37 #include "chromeos/dbus/session_manager_client.h" | 40 #include "chromeos/dbus/session_manager_client.h" |
38 #include "chromeos/dbus/sms_client.h" | 41 #include "chromeos/dbus/sms_client.h" |
39 #include "chromeos/dbus/speech_synthesizer_client.h" | 42 #include "chromeos/dbus/speech_synthesizer_client.h" |
40 #include "chromeos/dbus/update_engine_client.h" | 43 #include "chromeos/dbus/update_engine_client.h" |
41 #include "dbus/bus.h" | 44 #include "dbus/bus.h" |
42 | 45 |
43 namespace chromeos { | 46 namespace chromeos { |
44 | 47 |
45 static DBusThreadManager* g_dbus_thread_manager = NULL; | 48 static DBusThreadManager* g_dbus_thread_manager = NULL; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 FlimflamServiceClient::Create(client_type, system_bus_.get())); | 116 FlimflamServiceClient::Create(client_type, system_bus_.get())); |
114 // Create the Gsm SMS client. | 117 // Create the Gsm SMS client. |
115 gsm_sms_client_.reset( | 118 gsm_sms_client_.reset( |
116 GsmSMSClient::Create(client_type, system_bus_.get())); | 119 GsmSMSClient::Create(client_type, system_bus_.get())); |
117 // Create the image burner client. | 120 // Create the image burner client. |
118 image_burner_client_.reset(ImageBurnerClient::Create(client_type, | 121 image_burner_client_.reset(ImageBurnerClient::Create(client_type, |
119 system_bus_.get())); | 122 system_bus_.get())); |
120 // Create the introspectable object client. | 123 // Create the introspectable object client. |
121 introspectable_client_.reset( | 124 introspectable_client_.reset( |
122 IntrospectableClient::Create(client_type, system_bus_.get())); | 125 IntrospectableClient::Create(client_type, system_bus_.get())); |
| 126 // Create the MTPD client. |
| 127 mtpd_client_.reset(MTPDClient::Create(client_type, system_bus_.get())); |
123 // Create the ModemMessaging client. | 128 // Create the ModemMessaging client. |
124 modem_messaging_client_.reset( | 129 modem_messaging_client_.reset( |
125 ModemMessagingClient::Create(client_type, system_bus_.get())); | 130 ModemMessagingClient::Create(client_type, system_bus_.get())); |
126 // Create the power manager client. | 131 // Create the power manager client. |
127 power_manager_client_.reset( | 132 power_manager_client_.reset( |
128 PowerManagerClient::Create(client_type_maybe_stub, system_bus_.get())); | 133 PowerManagerClient::Create(client_type_maybe_stub, system_bus_.get())); |
129 // Create the session manager client. | 134 // Create the session manager client. |
130 session_manager_client_.reset( | 135 session_manager_client_.reset( |
131 SessionManagerClient::Create(client_type, system_bus_.get())); | 136 SessionManagerClient::Create(client_type, system_bus_.get())); |
132 // Create the SMS client. | 137 // Create the SMS client. |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE { | 294 virtual ImageBurnerClient* GetImageBurnerClient() OVERRIDE { |
290 return image_burner_client_.get(); | 295 return image_burner_client_.get(); |
291 } | 296 } |
292 | 297 |
293 // DBusThreadManager override. | 298 // DBusThreadManager override. |
294 virtual IntrospectableClient* GetIntrospectableClient() OVERRIDE { | 299 virtual IntrospectableClient* GetIntrospectableClient() OVERRIDE { |
295 return introspectable_client_.get(); | 300 return introspectable_client_.get(); |
296 } | 301 } |
297 | 302 |
298 // DBusThreadManager override. | 303 // DBusThreadManager override. |
| 304 virtual MTPDClient* GetMTPDClient() OVERRIDE { |
| 305 return mtpd_client_.get(); |
| 306 } |
| 307 |
| 308 // DBusThreadManager override. |
299 virtual ModemMessagingClient* GetModemMessagingClient() OVERRIDE { | 309 virtual ModemMessagingClient* GetModemMessagingClient() OVERRIDE { |
300 return modem_messaging_client_.get(); | 310 return modem_messaging_client_.get(); |
301 } | 311 } |
302 | 312 |
303 // DBusThreadManager override. | 313 // DBusThreadManager override. |
304 virtual PowerManagerClient* GetPowerManagerClient() OVERRIDE { | 314 virtual PowerManagerClient* GetPowerManagerClient() OVERRIDE { |
305 return power_manager_client_.get(); | 315 return power_manager_client_.get(); |
306 } | 316 } |
307 | 317 |
308 // DBusThreadManager override. | 318 // DBusThreadManager override. |
(...skipping 27 matching lines...) Expand all Loading... |
336 } | 346 } |
337 | 347 |
338 // DBusThreadManager override. | 348 // DBusThreadManager override. |
339 virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE { | 349 virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE { |
340 return ibus_engine_factory_service_.get(); | 350 return ibus_engine_factory_service_.get(); |
341 } | 351 } |
342 | 352 |
343 // DBusThreadManager override. | 353 // DBusThreadManager override. |
344 virtual IBusEngineService* GetIBusEngineService( | 354 virtual IBusEngineService* GetIBusEngineService( |
345 const dbus::ObjectPath& object_path) OVERRIDE { | 355 const dbus::ObjectPath& object_path) OVERRIDE { |
346 | |
347 const DBusClientImplementationType client_type = | 356 const DBusClientImplementationType client_type = |
348 base::chromeos::IsRunningOnChromeOS() ? REAL_DBUS_CLIENT_IMPLEMENTATION | 357 base::chromeos::IsRunningOnChromeOS() ? REAL_DBUS_CLIENT_IMPLEMENTATION |
349 : STUB_DBUS_CLIENT_IMPLEMENTATION; | 358 : STUB_DBUS_CLIENT_IMPLEMENTATION; |
350 | 359 |
351 if (ibus_engine_services_.find(object_path) | 360 if (ibus_engine_services_.find(object_path) |
352 == ibus_engine_services_.end()) { | 361 == ibus_engine_services_.end()) { |
353 ibus_engine_services_[object_path] = | 362 ibus_engine_services_[object_path] = |
354 IBusEngineService::Create(client_type, ibus_bus_.get(), object_path); | 363 IBusEngineService::Create(client_type, ibus_bus_.get(), object_path); |
355 } | 364 } |
356 return ibus_engine_services_[object_path]; | 365 return ibus_engine_services_[object_path]; |
(...skipping 25 matching lines...) Expand all Loading... |
382 scoped_ptr<DebugDaemonClient> debugdaemon_client_; | 391 scoped_ptr<DebugDaemonClient> debugdaemon_client_; |
383 scoped_ptr<FlimflamDeviceClient> flimflam_device_client_; | 392 scoped_ptr<FlimflamDeviceClient> flimflam_device_client_; |
384 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_; | 393 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_; |
385 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_; | 394 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_; |
386 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_; | 395 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_; |
387 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_; | 396 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_; |
388 scoped_ptr<FlimflamServiceClient> flimflam_service_client_; | 397 scoped_ptr<FlimflamServiceClient> flimflam_service_client_; |
389 scoped_ptr<GsmSMSClient> gsm_sms_client_; | 398 scoped_ptr<GsmSMSClient> gsm_sms_client_; |
390 scoped_ptr<ImageBurnerClient> image_burner_client_; | 399 scoped_ptr<ImageBurnerClient> image_burner_client_; |
391 scoped_ptr<IntrospectableClient> introspectable_client_; | 400 scoped_ptr<IntrospectableClient> introspectable_client_; |
| 401 scoped_ptr<MTPDClient> mtpd_client_; |
392 scoped_ptr<ModemMessagingClient> modem_messaging_client_; | 402 scoped_ptr<ModemMessagingClient> modem_messaging_client_; |
393 scoped_ptr<PowerManagerClient> power_manager_client_; | 403 scoped_ptr<PowerManagerClient> power_manager_client_; |
394 scoped_ptr<SessionManagerClient> session_manager_client_; | 404 scoped_ptr<SessionManagerClient> session_manager_client_; |
395 scoped_ptr<SMSClient> sms_client_; | 405 scoped_ptr<SMSClient> sms_client_; |
396 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; | 406 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; |
397 scoped_ptr<UpdateEngineClient> update_engine_client_; | 407 scoped_ptr<UpdateEngineClient> update_engine_client_; |
398 scoped_ptr<IBusClient> ibus_client_; | 408 scoped_ptr<IBusClient> ibus_client_; |
399 scoped_ptr<IBusInputContextClient> ibus_input_context_client_; | 409 scoped_ptr<IBusInputContextClient> ibus_input_context_client_; |
400 scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_; | 410 scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_; |
401 std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_; | 411 std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 } | 469 } |
460 | 470 |
461 // static | 471 // static |
462 DBusThreadManager* DBusThreadManager::Get() { | 472 DBusThreadManager* DBusThreadManager::Get() { |
463 CHECK(g_dbus_thread_manager) | 473 CHECK(g_dbus_thread_manager) |
464 << "DBusThreadManager::Get() called before Initialize()"; | 474 << "DBusThreadManager::Get() called before Initialize()"; |
465 return g_dbus_thread_manager; | 475 return g_dbus_thread_manager; |
466 } | 476 } |
467 | 477 |
468 } // namespace chromeos | 478 } // namespace chromeos |
OLD | NEW |