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

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

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/chromeos.gyp ('k') | chromeos/dbus/dbus_client_bundle.cc » ('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 #ifndef CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_ 5 #ifndef CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
6 #define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_ 6 #define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chromeos/chromeos_export.h" 9 #include "chromeos/chromeos_export.h"
10 10
(...skipping 13 matching lines...) Expand all
24 class CrosDisksClient; 24 class CrosDisksClient;
25 class CryptohomeClient; 25 class CryptohomeClient;
26 class DebugDaemonClient; 26 class DebugDaemonClient;
27 class EasyUnlockClient; 27 class EasyUnlockClient;
28 class LorgnetteManagerClient; 28 class LorgnetteManagerClient;
29 class ShillDeviceClient; 29 class ShillDeviceClient;
30 class ShillIPConfigClient; 30 class ShillIPConfigClient;
31 class ShillManagerClient; 31 class ShillManagerClient;
32 class ShillServiceClient; 32 class ShillServiceClient;
33 class ShillProfileClient; 33 class ShillProfileClient;
34 class ShillThirdPartyVpnDriverClient;
34 class GsmSMSClient; 35 class GsmSMSClient;
35 class ImageBurnerClient; 36 class ImageBurnerClient;
36 class IntrospectableClient; 37 class IntrospectableClient;
37 class ModemMessagingClient; 38 class ModemMessagingClient;
38 class NfcManagerClient; 39 class NfcManagerClient;
39 class NfcAdapterClient; 40 class NfcAdapterClient;
40 class NfcDeviceClient; 41 class NfcDeviceClient;
41 class NfcTagClient; 42 class NfcTagClient;
42 class NfcRecordClient; 43 class NfcRecordClient;
43 class PermissionBrokerClient; 44 class PermissionBrokerClient;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 175 }
175 176
176 ShillServiceClient* shill_service_client() { 177 ShillServiceClient* shill_service_client() {
177 return shill_service_client_.get(); 178 return shill_service_client_.get();
178 } 179 }
179 180
180 ShillProfileClient* shill_profile_client() { 181 ShillProfileClient* shill_profile_client() {
181 return shill_profile_client_.get(); 182 return shill_profile_client_.get();
182 } 183 }
183 184
185 ShillThirdPartyVpnDriverClient* shill_third_party_vpn_driver_client() {
186 return shill_third_party_vpn_driver_client_.get();
187 }
188
184 GsmSMSClient* gsm_sms_client() { 189 GsmSMSClient* gsm_sms_client() {
185 return gsm_sms_client_.get(); 190 return gsm_sms_client_.get();
186 } 191 }
187 192
188 ImageBurnerClient* image_burner_client() { 193 ImageBurnerClient* image_burner_client() {
189 return image_burner_client_.get(); 194 return image_burner_client_.get();
190 } 195 }
191 196
192 IntrospectableClient* introspectable_client() { 197 IntrospectableClient* introspectable_client() {
193 return introspectable_client_.get(); 198 return introspectable_client_.get();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 scoped_ptr<CryptohomeClient> cryptohome_client_; 273 scoped_ptr<CryptohomeClient> cryptohome_client_;
269 scoped_ptr<DebugDaemonClient> debug_daemon_client_; 274 scoped_ptr<DebugDaemonClient> debug_daemon_client_;
270 scoped_ptr<EasyUnlockClient> easy_unlock_client_; 275 scoped_ptr<EasyUnlockClient> easy_unlock_client_;
271 scoped_ptr<LorgnetteManagerClient> lorgnette_manager_client_; 276 scoped_ptr<LorgnetteManagerClient> lorgnette_manager_client_;
272 scoped_ptr<PrivetDaemonClient> privet_daemon_client_; 277 scoped_ptr<PrivetDaemonClient> privet_daemon_client_;
273 scoped_ptr<ShillDeviceClient> shill_device_client_; 278 scoped_ptr<ShillDeviceClient> shill_device_client_;
274 scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_; 279 scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
275 scoped_ptr<ShillManagerClient> shill_manager_client_; 280 scoped_ptr<ShillManagerClient> shill_manager_client_;
276 scoped_ptr<ShillServiceClient> shill_service_client_; 281 scoped_ptr<ShillServiceClient> shill_service_client_;
277 scoped_ptr<ShillProfileClient> shill_profile_client_; 282 scoped_ptr<ShillProfileClient> shill_profile_client_;
283 scoped_ptr<ShillThirdPartyVpnDriverClient>
284 shill_third_party_vpn_driver_client_;
278 scoped_ptr<GsmSMSClient> gsm_sms_client_; 285 scoped_ptr<GsmSMSClient> gsm_sms_client_;
279 scoped_ptr<ImageBurnerClient> image_burner_client_; 286 scoped_ptr<ImageBurnerClient> image_burner_client_;
280 scoped_ptr<IntrospectableClient> introspectable_client_; 287 scoped_ptr<IntrospectableClient> introspectable_client_;
281 scoped_ptr<ModemMessagingClient> modem_messaging_client_; 288 scoped_ptr<ModemMessagingClient> modem_messaging_client_;
282 // The declaration order for NFC client objects is important. See 289 // The declaration order for NFC client objects is important. See
283 // DBusThreadManager::InitializeClients for the dependencies. 290 // DBusThreadManager::InitializeClients for the dependencies.
284 scoped_ptr<NfcManagerClient> nfc_manager_client_; 291 scoped_ptr<NfcManagerClient> nfc_manager_client_;
285 scoped_ptr<NfcAdapterClient> nfc_adapter_client_; 292 scoped_ptr<NfcAdapterClient> nfc_adapter_client_;
286 scoped_ptr<NfcDeviceClient> nfc_device_client_; 293 scoped_ptr<NfcDeviceClient> nfc_device_client_;
287 scoped_ptr<NfcTagClient> nfc_tag_client_; 294 scoped_ptr<NfcTagClient> nfc_tag_client_;
288 scoped_ptr<NfcRecordClient> nfc_record_client_; 295 scoped_ptr<NfcRecordClient> nfc_record_client_;
289 scoped_ptr<PermissionBrokerClient> permission_broker_client_; 296 scoped_ptr<PermissionBrokerClient> permission_broker_client_;
290 scoped_ptr<SystemClockClient> system_clock_client_; 297 scoped_ptr<SystemClockClient> system_clock_client_;
291 scoped_ptr<PowerManagerClient> power_manager_client_; 298 scoped_ptr<PowerManagerClient> power_manager_client_;
292 scoped_ptr<SessionManagerClient> session_manager_client_; 299 scoped_ptr<SessionManagerClient> session_manager_client_;
293 scoped_ptr<SMSClient> sms_client_; 300 scoped_ptr<SMSClient> sms_client_;
294 scoped_ptr<UpdateEngineClient> update_engine_client_; 301 scoped_ptr<UpdateEngineClient> update_engine_client_;
295 302
296 DISALLOW_COPY_AND_ASSIGN(DBusClientBundle); 303 DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
297 }; 304 };
298 305
299 } // namespace chromeos 306 } // namespace chromeos
300 307
301 #endif // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_ 308 #endif // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
OLDNEW
« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/dbus/dbus_client_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698