| Index: chromeos/dbus/dbus_client_bundle.h
|
| diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h
|
| index 536eb4deb19d9bfc85a7856bf06b552e9c2bf859..71d23201713a728481579f67812e1a622c432ac0 100644
|
| --- a/chromeos/dbus/dbus_client_bundle.h
|
| +++ b/chromeos/dbus/dbus_client_bundle.h
|
| @@ -14,7 +14,7 @@ namespace chromeos {
|
|
|
| class AmplifierClient;
|
| class ApManagerClient;
|
| -class ArcBridgeClient;
|
| +class ArcInstanceClient;
|
| class AudioDspClient;
|
| class BluetoothAdapterClient;
|
| class BluetoothAgentManagerClient;
|
| @@ -93,7 +93,7 @@ class CHROMEOS_EXPORT DBusClientBundle {
|
| PRIVET_DAEMON = 1 << 21,
|
| AMPLIFIER = 1 << 22,
|
| AUDIO_DSP = 1 << 23,
|
| - ARC_BRIDGE = 1 << 24,
|
| + ARC_INSTANCE = 1 << 24,
|
| };
|
|
|
| explicit DBusClientBundle(DBusClientTypeMask unstub_client_mask);
|
| @@ -116,7 +116,9 @@ class CHROMEOS_EXPORT DBusClientBundle {
|
|
|
| ApManagerClient* ap_manager_client() { return ap_manager_client_.get(); }
|
|
|
| - ArcBridgeClient* arc_bridge_client() { return arc_bridge_client_.get(); }
|
| + ArcInstanceClient* arc_instance_client() {
|
| + return arc_instance_client_.get();
|
| + }
|
|
|
| AudioDspClient* audio_dsp_client() { return audio_dsp_client_.get(); }
|
|
|
| @@ -294,7 +296,7 @@ class CHROMEOS_EXPORT DBusClientBundle {
|
|
|
| scoped_ptr<AmplifierClient> amplifier_client_;
|
| scoped_ptr<ApManagerClient> ap_manager_client_;
|
| - scoped_ptr<ArcBridgeClient> arc_bridge_client_;
|
| + scoped_ptr<ArcInstanceClient> arc_instance_client_;
|
| scoped_ptr<AudioDspClient> audio_dsp_client_;
|
| scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
|
| scoped_ptr<BluetoothLEAdvertisingManagerClient>
|
|
|