| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "chromeos/dbus/permission_broker_client.h" | 38 #include "chromeos/dbus/permission_broker_client.h" |
| 39 #include "chromeos/dbus/power_manager_client.h" | 39 #include "chromeos/dbus/power_manager_client.h" |
| 40 #include "chromeos/dbus/power_policy_controller.h" | 40 #include "chromeos/dbus/power_policy_controller.h" |
| 41 #include "chromeos/dbus/privet_daemon_client.h" | 41 #include "chromeos/dbus/privet_daemon_client.h" |
| 42 #include "chromeos/dbus/session_manager_client.h" | 42 #include "chromeos/dbus/session_manager_client.h" |
| 43 #include "chromeos/dbus/shill_device_client.h" | 43 #include "chromeos/dbus/shill_device_client.h" |
| 44 #include "chromeos/dbus/shill_ipconfig_client.h" | 44 #include "chromeos/dbus/shill_ipconfig_client.h" |
| 45 #include "chromeos/dbus/shill_manager_client.h" | 45 #include "chromeos/dbus/shill_manager_client.h" |
| 46 #include "chromeos/dbus/shill_profile_client.h" | 46 #include "chromeos/dbus/shill_profile_client.h" |
| 47 #include "chromeos/dbus/shill_service_client.h" | 47 #include "chromeos/dbus/shill_service_client.h" |
| 48 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" |
| 48 #include "chromeos/dbus/sms_client.h" | 49 #include "chromeos/dbus/sms_client.h" |
| 49 #include "chromeos/dbus/system_clock_client.h" | 50 #include "chromeos/dbus/system_clock_client.h" |
| 50 #include "chromeos/dbus/update_engine_client.h" | 51 #include "chromeos/dbus/update_engine_client.h" |
| 51 #include "dbus/bus.h" | 52 #include "dbus/bus.h" |
| 52 #include "dbus/dbus_statistics.h" | 53 #include "dbus/dbus_statistics.h" |
| 53 | 54 |
| 54 namespace chromeos { | 55 namespace chromeos { |
| 55 | 56 |
| 56 static DBusThreadManager* g_dbus_thread_manager = NULL; | 57 static DBusThreadManager* g_dbus_thread_manager = NULL; |
| 57 static bool g_using_dbus_thread_manager_for_testing = false; | 58 static bool g_using_dbus_thread_manager_for_testing = false; |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 ShillServiceClient* | 206 ShillServiceClient* |
| 206 DBusThreadManager::GetShillServiceClient() { | 207 DBusThreadManager::GetShillServiceClient() { |
| 207 return client_bundle_->shill_service_client(); | 208 return client_bundle_->shill_service_client(); |
| 208 } | 209 } |
| 209 | 210 |
| 210 ShillProfileClient* | 211 ShillProfileClient* |
| 211 DBusThreadManager::GetShillProfileClient() { | 212 DBusThreadManager::GetShillProfileClient() { |
| 212 return client_bundle_->shill_profile_client(); | 213 return client_bundle_->shill_profile_client(); |
| 213 } | 214 } |
| 214 | 215 |
| 216 ShillThirdPartyVpnDriverClient* |
| 217 DBusThreadManager::GetShillThirdPartyVpnDriverClient() { |
| 218 return client_bundle_->shill_third_party_vpn_driver_client(); |
| 219 } |
| 220 |
| 215 GsmSMSClient* DBusThreadManager::GetGsmSMSClient() { | 221 GsmSMSClient* DBusThreadManager::GetGsmSMSClient() { |
| 216 return client_bundle_->gsm_sms_client(); | 222 return client_bundle_->gsm_sms_client(); |
| 217 } | 223 } |
| 218 | 224 |
| 219 ImageBurnerClient* DBusThreadManager::GetImageBurnerClient() { | 225 ImageBurnerClient* DBusThreadManager::GetImageBurnerClient() { |
| 220 return client_bundle_->image_burner_client(); | 226 return client_bundle_->image_burner_client(); |
| 221 } | 227 } |
| 222 | 228 |
| 223 IntrospectableClient* DBusThreadManager::GetIntrospectableClient() { | 229 IntrospectableClient* DBusThreadManager::GetIntrospectableClient() { |
| 224 return client_bundle_->introspectable_client(); | 230 return client_bundle_->introspectable_client(); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 GetModemMessagingClient()->Init(GetSystemBus()); | 309 GetModemMessagingClient()->Init(GetSystemBus()); |
| 304 GetPermissionBrokerClient()->Init(GetSystemBus()); | 310 GetPermissionBrokerClient()->Init(GetSystemBus()); |
| 305 GetPowerManagerClient()->Init(GetSystemBus()); | 311 GetPowerManagerClient()->Init(GetSystemBus()); |
| 306 GetPrivetDaemonClient()->Init(GetSystemBus()); | 312 GetPrivetDaemonClient()->Init(GetSystemBus()); |
| 307 GetSessionManagerClient()->Init(GetSystemBus()); | 313 GetSessionManagerClient()->Init(GetSystemBus()); |
| 308 GetShillDeviceClient()->Init(GetSystemBus()); | 314 GetShillDeviceClient()->Init(GetSystemBus()); |
| 309 GetShillIPConfigClient()->Init(GetSystemBus()); | 315 GetShillIPConfigClient()->Init(GetSystemBus()); |
| 310 GetShillManagerClient()->Init(GetSystemBus()); | 316 GetShillManagerClient()->Init(GetSystemBus()); |
| 311 GetShillServiceClient()->Init(GetSystemBus()); | 317 GetShillServiceClient()->Init(GetSystemBus()); |
| 312 GetShillProfileClient()->Init(GetSystemBus()); | 318 GetShillProfileClient()->Init(GetSystemBus()); |
| 319 GetShillThirdPartyVpnDriverClient()->Init(GetSystemBus()); |
| 313 GetSMSClient()->Init(GetSystemBus()); | 320 GetSMSClient()->Init(GetSystemBus()); |
| 314 GetSystemClockClient()->Init(GetSystemBus()); | 321 GetSystemClockClient()->Init(GetSystemBus()); |
| 315 GetUpdateEngineClient()->Init(GetSystemBus()); | 322 GetUpdateEngineClient()->Init(GetSystemBus()); |
| 316 | 323 |
| 317 // Initialize the NFC clients in the correct order. The order of | 324 // Initialize the NFC clients in the correct order. The order of |
| 318 // initialization matters due to dependencies that exist between the | 325 // initialization matters due to dependencies that exist between the |
| 319 // client objects. | 326 // client objects. |
| 320 GetNfcManagerClient()->Init(GetSystemBus()); | 327 GetNfcManagerClient()->Init(GetSystemBus()); |
| 321 GetNfcAdapterClient()->Init(GetSystemBus()); | 328 GetNfcAdapterClient()->Init(GetSystemBus()); |
| 322 GetNfcDeviceClient()->Init(GetSystemBus()); | 329 GetNfcDeviceClient()->Init(GetSystemBus()); |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 client.Pass(); | 654 client.Pass(); |
| 648 } | 655 } |
| 649 | 656 |
| 650 void DBusThreadManagerSetter::SetUpdateEngineClient( | 657 void DBusThreadManagerSetter::SetUpdateEngineClient( |
| 651 scoped_ptr<UpdateEngineClient> client) { | 658 scoped_ptr<UpdateEngineClient> client) { |
| 652 DBusThreadManager::Get()->client_bundle_->update_engine_client_ = | 659 DBusThreadManager::Get()->client_bundle_->update_engine_client_ = |
| 653 client.Pass(); | 660 client.Pass(); |
| 654 } | 661 } |
| 655 | 662 |
| 656 } // namespace chromeos | 663 } // namespace chromeos |
| OLD | NEW |