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

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

Issue 681723003: Add new shill client for VPN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes nit from Steven 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
« no previous file with comments | « chromeos/dbus/dbus_client_bundle.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_client_bundle.h" 5 #include "chromeos/dbus/dbus_client_bundle.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chromeos/dbus/fake_nfc_manager_client.h" 47 #include "chromeos/dbus/fake_nfc_manager_client.h"
48 #include "chromeos/dbus/fake_nfc_record_client.h" 48 #include "chromeos/dbus/fake_nfc_record_client.h"
49 #include "chromeos/dbus/fake_nfc_tag_client.h" 49 #include "chromeos/dbus/fake_nfc_tag_client.h"
50 #include "chromeos/dbus/fake_permission_broker_client.h" 50 #include "chromeos/dbus/fake_permission_broker_client.h"
51 #include "chromeos/dbus/fake_privet_daemon_client.h" 51 #include "chromeos/dbus/fake_privet_daemon_client.h"
52 #include "chromeos/dbus/fake_shill_device_client.h" 52 #include "chromeos/dbus/fake_shill_device_client.h"
53 #include "chromeos/dbus/fake_shill_ipconfig_client.h" 53 #include "chromeos/dbus/fake_shill_ipconfig_client.h"
54 #include "chromeos/dbus/fake_shill_manager_client.h" 54 #include "chromeos/dbus/fake_shill_manager_client.h"
55 #include "chromeos/dbus/fake_shill_profile_client.h" 55 #include "chromeos/dbus/fake_shill_profile_client.h"
56 #include "chromeos/dbus/fake_shill_service_client.h" 56 #include "chromeos/dbus/fake_shill_service_client.h"
57 #include "chromeos/dbus/fake_shill_third_party_vpn_driver_client.h"
57 #include "chromeos/dbus/fake_sms_client.h" 58 #include "chromeos/dbus/fake_sms_client.h"
58 #include "chromeos/dbus/fake_system_clock_client.h" 59 #include "chromeos/dbus/fake_system_clock_client.h"
59 #include "chromeos/dbus/gsm_sms_client.h" 60 #include "chromeos/dbus/gsm_sms_client.h"
60 #include "chromeos/dbus/image_burner_client.h" 61 #include "chromeos/dbus/image_burner_client.h"
61 #include "chromeos/dbus/introspectable_client.h" 62 #include "chromeos/dbus/introspectable_client.h"
62 #include "chromeos/dbus/lorgnette_manager_client.h" 63 #include "chromeos/dbus/lorgnette_manager_client.h"
63 #include "chromeos/dbus/modem_messaging_client.h" 64 #include "chromeos/dbus/modem_messaging_client.h"
64 #include "chromeos/dbus/nfc_adapter_client.h" 65 #include "chromeos/dbus/nfc_adapter_client.h"
65 #include "chromeos/dbus/nfc_device_client.h" 66 #include "chromeos/dbus/nfc_device_client.h"
66 #include "chromeos/dbus/nfc_manager_client.h" 67 #include "chromeos/dbus/nfc_manager_client.h"
67 #include "chromeos/dbus/nfc_record_client.h" 68 #include "chromeos/dbus/nfc_record_client.h"
68 #include "chromeos/dbus/nfc_tag_client.h" 69 #include "chromeos/dbus/nfc_tag_client.h"
69 #include "chromeos/dbus/permission_broker_client.h" 70 #include "chromeos/dbus/permission_broker_client.h"
70 #include "chromeos/dbus/power_manager_client.h" 71 #include "chromeos/dbus/power_manager_client.h"
71 #include "chromeos/dbus/power_policy_controller.h" 72 #include "chromeos/dbus/power_policy_controller.h"
72 #include "chromeos/dbus/privet_daemon_client.h" 73 #include "chromeos/dbus/privet_daemon_client.h"
73 #include "chromeos/dbus/session_manager_client.h" 74 #include "chromeos/dbus/session_manager_client.h"
74 #include "chromeos/dbus/shill_device_client.h" 75 #include "chromeos/dbus/shill_device_client.h"
75 #include "chromeos/dbus/shill_ipconfig_client.h" 76 #include "chromeos/dbus/shill_ipconfig_client.h"
76 #include "chromeos/dbus/shill_manager_client.h" 77 #include "chromeos/dbus/shill_manager_client.h"
77 #include "chromeos/dbus/shill_profile_client.h" 78 #include "chromeos/dbus/shill_profile_client.h"
78 #include "chromeos/dbus/shill_service_client.h" 79 #include "chromeos/dbus/shill_service_client.h"
80 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h"
79 #include "chromeos/dbus/sms_client.h" 81 #include "chromeos/dbus/sms_client.h"
80 #include "chromeos/dbus/system_clock_client.h" 82 #include "chromeos/dbus/system_clock_client.h"
81 #include "chromeos/dbus/update_engine_client.h" 83 #include "chromeos/dbus/update_engine_client.h"
82 84
83 namespace chromeos { 85 namespace chromeos {
84 86
85 namespace { 87 namespace {
86 88
87 // Command line switch mapping for --dbus-unstub-clients. 89 // Command line switch mapping for --dbus-unstub-clients.
88 const struct { 90 const struct {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 lorgnette_manager_client_.reset(LorgnetteManagerClient::Create()); 189 lorgnette_manager_client_.reset(LorgnetteManagerClient::Create());
188 else 190 else
189 lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient); 191 lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient);
190 192
191 if (!IsUsingStub(SHILL)) { 193 if (!IsUsingStub(SHILL)) {
192 shill_manager_client_.reset(ShillManagerClient::Create()); 194 shill_manager_client_.reset(ShillManagerClient::Create());
193 shill_device_client_.reset(ShillDeviceClient::Create()); 195 shill_device_client_.reset(ShillDeviceClient::Create());
194 shill_ipconfig_client_.reset(ShillIPConfigClient::Create()); 196 shill_ipconfig_client_.reset(ShillIPConfigClient::Create());
195 shill_service_client_.reset(ShillServiceClient::Create()); 197 shill_service_client_.reset(ShillServiceClient::Create());
196 shill_profile_client_.reset(ShillProfileClient::Create()); 198 shill_profile_client_.reset(ShillProfileClient::Create());
199 shill_third_party_vpn_driver_client_.reset(
200 ShillThirdPartyVpnDriverClient::Create());
197 } else { 201 } else {
198 shill_manager_client_.reset(new FakeShillManagerClient); 202 shill_manager_client_.reset(new FakeShillManagerClient);
199 shill_device_client_.reset(new FakeShillDeviceClient); 203 shill_device_client_.reset(new FakeShillDeviceClient);
200 shill_ipconfig_client_.reset(new FakeShillIPConfigClient); 204 shill_ipconfig_client_.reset(new FakeShillIPConfigClient);
201 shill_service_client_.reset(new FakeShillServiceClient); 205 shill_service_client_.reset(new FakeShillServiceClient);
202 shill_profile_client_.reset(new FakeShillProfileClient); 206 shill_profile_client_.reset(new FakeShillProfileClient);
207 shill_third_party_vpn_driver_client_.reset(
208 new FakeShillThirdPartyVpnDriverClient);
203 } 209 }
204 210
205 if (!IsUsingStub(GSM_SMS)) { 211 if (!IsUsingStub(GSM_SMS)) {
206 gsm_sms_client_.reset(GsmSMSClient::Create()); 212 gsm_sms_client_.reset(GsmSMSClient::Create());
207 } else { 213 } else {
208 FakeGsmSMSClient* gsm_sms_client = new FakeGsmSMSClient(); 214 FakeGsmSMSClient* gsm_sms_client = new FakeGsmSMSClient();
209 gsm_sms_client->set_sms_test_message_switch_present( 215 gsm_sms_client->set_sms_test_message_switch_present(
210 CommandLine::ForCurrentProcess()->HasSwitch( 216 CommandLine::ForCurrentProcess()->HasSwitch(
211 chromeos::switches::kSmsTestMessages)); 217 chromeos::switches::kSmsTestMessages));
212 gsm_sms_client_.reset(gsm_sms_client); 218 gsm_sms_client_.reset(gsm_sms_client);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 unstub_mask |= client; 318 unstub_mask |= client;
313 } else { 319 } else {
314 LOG(ERROR) << "Unknown dbus client: " << *iter; 320 LOG(ERROR) << "Unknown dbus client: " << *iter;
315 } 321 }
316 } 322 }
317 323
318 return unstub_mask; 324 return unstub_mask;
319 } 325 }
320 326
321 } // namespace chromeos 327 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/dbus_client_bundle.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698