| Index: content/renderer/bluetooth/web_bluetooth_impl.h
|
| diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
|
| index 1351bce774a99f41527a08764c56fbeff5a61227..431a4e4ae004b9b71c9db060d756474c0bbbc14a 100644
|
| --- a/content/renderer/bluetooth/web_bluetooth_impl.h
|
| +++ b/content/renderer/bluetooth/web_bluetooth_impl.h
|
| @@ -86,8 +86,8 @@ class CONTENT_EXPORT WebBluetoothImpl
|
| struct GetCharacteristicsCallback;
|
| // WebBluetoothServiceClient methods:
|
| void RemoteCharacteristicValueChanged(
|
| - const mojo::String& characteristic_instance_id,
|
| - mojo::Array<uint8_t> value) override;
|
| + const std::string& characteristic_instance_id,
|
| + const std::vector<uint8_t>& value) override;
|
| void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
|
|
|
| // Callbacks for WebBluetoothService calls:
|
| @@ -103,17 +103,20 @@ class CONTENT_EXPORT WebBluetoothImpl
|
| const blink::WebString& device_id,
|
| std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
|
| blink::mojom::WebBluetoothResult result,
|
| - mojo::Array<blink::mojom::WebBluetoothRemoteGATTServicePtr> services);
|
| + base::Optional<
|
| + std::vector<blink::mojom::WebBluetoothRemoteGATTServicePtr>>
|
| + services);
|
| void OnGetCharacteristicsComplete(
|
| const blink::WebString& service_instance_id,
|
| std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
|
| blink::mojom::WebBluetoothResult result,
|
| - mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
|
| + base::Optional<
|
| + std::vector<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>>
|
| characteristics);
|
| void OnReadValueComplete(
|
| std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
|
| blink::mojom::WebBluetoothResult result,
|
| - mojo::Array<uint8_t> value);
|
| + const base::Optional<std::vector<uint8_t>>& value);
|
| void OnWriteValueComplete(
|
| const blink::WebVector<uint8_t>& value,
|
| std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
|
|
|