| Index: components/arc/bluetooth/arc_bluetooth_bridge.h
|
| diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.h b/components/arc/bluetooth/arc_bluetooth_bridge.h
|
| index 306407320f01fa9143109432acb18cd93303ae0a..779e23622c954007cb16bd1c9650cb8de68e931f 100644
|
| --- a/components/arc/bluetooth/arc_bluetooth_bridge.h
|
| +++ b/components/arc/bluetooth/arc_bluetooth_bridge.h
|
| @@ -31,7 +31,7 @@ class ArcBluetoothBridge
|
| public ArcBridgeService::Observer,
|
| public device::BluetoothAdapter::Observer,
|
| public device::BluetoothAdapterFactory::AdapterCallback,
|
| - public BluetoothHost {
|
| + public mojom::BluetoothHost {
|
| public:
|
| explicit ArcBluetoothBridge(ArcBridgeService* bridge_service);
|
| ~ArcBluetoothBridge() override;
|
| @@ -108,51 +108,51 @@ class ArcBluetoothBridge
|
| void EnableAdapter(const EnableAdapterCallback& callback) override;
|
| void DisableAdapter(const DisableAdapterCallback& callback) override;
|
|
|
| - void GetAdapterProperty(BluetoothPropertyType type) override;
|
| - void SetAdapterProperty(BluetoothPropertyPtr property) override;
|
| + void GetAdapterProperty(mojom::BluetoothPropertyType type) override;
|
| + void SetAdapterProperty(mojom::BluetoothPropertyPtr property) override;
|
|
|
| - void GetRemoteDeviceProperty(BluetoothAddressPtr remote_addr,
|
| - BluetoothPropertyType type) override;
|
| - void SetRemoteDeviceProperty(BluetoothAddressPtr remote_addr,
|
| - BluetoothPropertyPtr property) override;
|
| - void GetRemoteServiceRecord(BluetoothAddressPtr remote_addr,
|
| - BluetoothUUIDPtr uuid) override;
|
| + void GetRemoteDeviceProperty(mojom::BluetoothAddressPtr remote_addr,
|
| + mojom::BluetoothPropertyType type) override;
|
| + void SetRemoteDeviceProperty(mojom::BluetoothAddressPtr remote_addr,
|
| + mojom::BluetoothPropertyPtr property) override;
|
| + void GetRemoteServiceRecord(mojom::BluetoothAddressPtr remote_addr,
|
| + mojom::BluetoothUUIDPtr uuid) override;
|
|
|
| - void GetRemoteServices(BluetoothAddressPtr remote_addr) override;
|
| + void GetRemoteServices(mojom::BluetoothAddressPtr remote_addr) override;
|
|
|
| void StartDiscovery() override;
|
| void CancelDiscovery() override;
|
|
|
| - void CreateBond(BluetoothAddressPtr addr, int32_t transport) override;
|
| - void RemoveBond(BluetoothAddressPtr addr) override;
|
| - void CancelBond(BluetoothAddressPtr addr) override;
|
| + void CreateBond(mojom::BluetoothAddressPtr addr, int32_t transport) override;
|
| + void RemoveBond(mojom::BluetoothAddressPtr addr) override;
|
| + void CancelBond(mojom::BluetoothAddressPtr addr) override;
|
|
|
| - void GetConnectionState(BluetoothAddressPtr addr,
|
| + void GetConnectionState(mojom::BluetoothAddressPtr addr,
|
| const GetConnectionStateCallback& callback) override;
|
|
|
| // Chrome observer callbacks
|
| void OnPoweredOn(
|
| - const mojo::Callback<void(BluetoothAdapterState)>& callback) const;
|
| + const mojo::Callback<void(mojom::BluetoothAdapterState)>& callback) const;
|
| void OnPoweredOff(
|
| - const mojo::Callback<void(BluetoothAdapterState)>& callback) const;
|
| + const mojo::Callback<void(mojom::BluetoothAdapterState)>& callback) const;
|
| void OnPoweredError(
|
| - const mojo::Callback<void(BluetoothAdapterState)>& callback) const;
|
| + const mojo::Callback<void(mojom::BluetoothAdapterState)>& callback) const;
|
| void OnDiscoveryStarted(
|
| scoped_ptr<device::BluetoothDiscoverySession> session);
|
| void OnDiscoveryStopped();
|
| void OnDiscoveryError();
|
|
|
| private:
|
| - mojo::Array<BluetoothPropertyPtr> GetDeviceProperties(
|
| - BluetoothPropertyType type,
|
| + mojo::Array<mojom::BluetoothPropertyPtr> GetDeviceProperties(
|
| + mojom::BluetoothPropertyType type,
|
| device::BluetoothDevice* device);
|
| - mojo::Array<BluetoothPropertyPtr> GetAdapterProperties(
|
| - BluetoothPropertyType type);
|
| + mojo::Array<mojom::BluetoothPropertyPtr> GetAdapterProperties(
|
| + mojom::BluetoothPropertyType type);
|
|
|
| void SendCachedDevicesFound();
|
| bool HasBluetoothInstance();
|
|
|
| - mojo::Binding<BluetoothHost> binding_;
|
| + mojo::Binding<mojom::BluetoothHost> binding_;
|
|
|
| scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
|
| scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
|
|
|