Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 681723003: Add new shill client for VPN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extended to include related changes in dbus and adds a fake client Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 25 matching lines...) Expand all
36 #include "chromeos/dbus/nfc_tag_client.h" 36 #include "chromeos/dbus/nfc_tag_client.h"
37 #include "chromeos/dbus/permission_broker_client.h" 37 #include "chromeos/dbus/permission_broker_client.h"
38 #include "chromeos/dbus/power_manager_client.h" 38 #include "chromeos/dbus/power_manager_client.h"
39 #include "chromeos/dbus/power_policy_controller.h" 39 #include "chromeos/dbus/power_policy_controller.h"
40 #include "chromeos/dbus/session_manager_client.h" 40 #include "chromeos/dbus/session_manager_client.h"
41 #include "chromeos/dbus/shill_device_client.h" 41 #include "chromeos/dbus/shill_device_client.h"
42 #include "chromeos/dbus/shill_ipconfig_client.h" 42 #include "chromeos/dbus/shill_ipconfig_client.h"
43 #include "chromeos/dbus/shill_manager_client.h" 43 #include "chromeos/dbus/shill_manager_client.h"
44 #include "chromeos/dbus/shill_profile_client.h" 44 #include "chromeos/dbus/shill_profile_client.h"
45 #include "chromeos/dbus/shill_service_client.h" 45 #include "chromeos/dbus/shill_service_client.h"
46 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h"
46 #include "chromeos/dbus/sms_client.h" 47 #include "chromeos/dbus/sms_client.h"
47 #include "chromeos/dbus/system_clock_client.h" 48 #include "chromeos/dbus/system_clock_client.h"
48 #include "chromeos/dbus/update_engine_client.h" 49 #include "chromeos/dbus/update_engine_client.h"
49 #include "dbus/bus.h" 50 #include "dbus/bus.h"
50 #include "dbus/dbus_statistics.h" 51 #include "dbus/dbus_statistics.h"
51 52
52 namespace chromeos { 53 namespace chromeos {
53 54
54 static DBusThreadManager* g_dbus_thread_manager = NULL; 55 static DBusThreadManager* g_dbus_thread_manager = NULL;
55 static bool g_using_dbus_thread_manager_for_testing = false; 56 static bool g_using_dbus_thread_manager_for_testing = false;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ShillServiceClient* 200 ShillServiceClient*
200 DBusThreadManager::GetShillServiceClient() { 201 DBusThreadManager::GetShillServiceClient() {
201 return client_bundle_->shill_service_client(); 202 return client_bundle_->shill_service_client();
202 } 203 }
203 204
204 ShillProfileClient* 205 ShillProfileClient*
205 DBusThreadManager::GetShillProfileClient() { 206 DBusThreadManager::GetShillProfileClient() {
206 return client_bundle_->shill_profile_client(); 207 return client_bundle_->shill_profile_client();
207 } 208 }
208 209
210 ShillThirdPartyVpnDriverClient*
211 DBusThreadManager::GetShillThirdPartyVpnDriverClient() {
212 return client_bundle_->shill_third_party_vpn_driver_client();
213 }
214
209 GsmSMSClient* DBusThreadManager::GetGsmSMSClient() { 215 GsmSMSClient* DBusThreadManager::GetGsmSMSClient() {
210 return client_bundle_->gsm_sms_client(); 216 return client_bundle_->gsm_sms_client();
211 } 217 }
212 218
213 ImageBurnerClient* DBusThreadManager::GetImageBurnerClient() { 219 ImageBurnerClient* DBusThreadManager::GetImageBurnerClient() {
214 return client_bundle_->image_burner_client(); 220 return client_bundle_->image_burner_client();
215 } 221 }
216 222
217 IntrospectableClient* DBusThreadManager::GetIntrospectableClient() { 223 IntrospectableClient* DBusThreadManager::GetIntrospectableClient() {
218 return client_bundle_->introspectable_client(); 224 return client_bundle_->introspectable_client();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 GetLorgnetteManagerClient()->Init(GetSystemBus()); 297 GetLorgnetteManagerClient()->Init(GetSystemBus());
292 GetModemMessagingClient()->Init(GetSystemBus()); 298 GetModemMessagingClient()->Init(GetSystemBus());
293 GetPermissionBrokerClient()->Init(GetSystemBus()); 299 GetPermissionBrokerClient()->Init(GetSystemBus());
294 GetPowerManagerClient()->Init(GetSystemBus()); 300 GetPowerManagerClient()->Init(GetSystemBus());
295 GetSessionManagerClient()->Init(GetSystemBus()); 301 GetSessionManagerClient()->Init(GetSystemBus());
296 GetShillDeviceClient()->Init(GetSystemBus()); 302 GetShillDeviceClient()->Init(GetSystemBus());
297 GetShillIPConfigClient()->Init(GetSystemBus()); 303 GetShillIPConfigClient()->Init(GetSystemBus());
298 GetShillManagerClient()->Init(GetSystemBus()); 304 GetShillManagerClient()->Init(GetSystemBus());
299 GetShillServiceClient()->Init(GetSystemBus()); 305 GetShillServiceClient()->Init(GetSystemBus());
300 GetShillProfileClient()->Init(GetSystemBus()); 306 GetShillProfileClient()->Init(GetSystemBus());
307 GetShillThirdPartyVpnDriverClient()->Init(GetSystemBus());
301 GetSMSClient()->Init(GetSystemBus()); 308 GetSMSClient()->Init(GetSystemBus());
302 GetSystemClockClient()->Init(GetSystemBus()); 309 GetSystemClockClient()->Init(GetSystemBus());
303 GetUpdateEngineClient()->Init(GetSystemBus()); 310 GetUpdateEngineClient()->Init(GetSystemBus());
304 311
305 // Initialize the NFC clients in the correct order. The order of 312 // Initialize the NFC clients in the correct order. The order of
306 // initialization matters due to dependencies that exist between the 313 // initialization matters due to dependencies that exist between the
307 // client objects. 314 // client objects.
308 GetNfcManagerClient()->Init(GetSystemBus()); 315 GetNfcManagerClient()->Init(GetSystemBus());
309 GetNfcAdapterClient()->Init(GetSystemBus()); 316 GetNfcAdapterClient()->Init(GetSystemBus());
310 GetNfcDeviceClient()->Init(GetSystemBus()); 317 GetNfcDeviceClient()->Init(GetSystemBus());
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 client.Pass(); 630 client.Pass();
624 } 631 }
625 632
626 void DBusThreadManagerSetter::SetUpdateEngineClient( 633 void DBusThreadManagerSetter::SetUpdateEngineClient(
627 scoped_ptr<UpdateEngineClient> client) { 634 scoped_ptr<UpdateEngineClient> client) {
628 DBusThreadManager::Get()->client_bundle_->update_engine_client_ = 635 DBusThreadManager::Get()->client_bundle_->update_engine_client_ =
629 client.Pass(); 636 client.Pass();
630 } 637 }
631 638
632 } // namespace chromeos 639 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698