| 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 cebf74f7253c0ffba1431be1f69f9004ea8b885f..788d6bb1fac891590ccf6f8d7cc54df599240518 100644
|
| --- a/components/arc/bluetooth/arc_bluetooth_bridge.h
|
| +++ b/components/arc/bluetooth/arc_bluetooth_bridge.h
|
| @@ -32,7 +32,7 @@ class ArcBridgeService;
|
|
|
| class ArcBluetoothBridge
|
| : public ArcService,
|
| - public ArcBridgeService::Observer,
|
| + public ArcBridgeService::InstanceObserver<mojom::BluetoothInstance>,
|
| public device::BluetoothAdapter::Observer,
|
| public device::BluetoothAdapterFactory::AdapterCallback,
|
| public mojom::BluetoothHost {
|
| @@ -40,8 +40,10 @@ class ArcBluetoothBridge
|
| explicit ArcBluetoothBridge(ArcBridgeService* bridge_service);
|
| ~ArcBluetoothBridge() override;
|
|
|
| - // Overridden from ArcBridgeService::Observer:
|
| - void OnBluetoothInstanceReady() override;
|
| + // Overridden from
|
| + // ArcBridgeService::InstanceObserver<mojom::BluetoothInstance>:
|
| + void OnInstanceReady(mojom::BluetoothInstance* bluetooth_instance,
|
| + uint32_t version) override;
|
|
|
| void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter);
|
|
|
| @@ -264,7 +266,7 @@ class ArcBluetoothBridge
|
|
|
| void SendCachedDevicesFound() const;
|
| bool HasBluetoothInstance() const;
|
| - bool CheckBluetoothInstanceVersion(int32_t version_need) const;
|
| + bool CheckBluetoothInstanceVersion(uint32_t version_need) const;
|
|
|
| template <class T>
|
| T* FindGattObjectFromUuid(const std::vector<T*> objs,
|
|
|