| Index: content/renderer/bluetooth/bluetooth_type_converters.cc
|
| diff --git a/content/renderer/bluetooth/bluetooth_type_converters.cc b/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| index c7bf1a7948979c4a696ddd358ccc2879c247d3ac..5782b1dc67e50407adba6f5cecb0cb32ea038f7b 100644
|
| --- a/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| +++ b/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| @@ -37,8 +37,13 @@ TypeConverter<blink::mojom::WebBluetoothRequestDeviceOptionsPtr,
|
| blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
|
| blink::mojom::WebBluetoothRequestDeviceOptions::New();
|
|
|
| - options->filters = mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>::From(
|
| - web_options.filters);
|
| + options->accept_all_devices = web_options.acceptAllDevices;
|
| +
|
| + if (web_options.hasFilters) {
|
| + options->filters =
|
| + mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>::From(
|
| + web_options.filters);
|
| + }
|
| options->optional_services =
|
| mojo::Array<base::Optional<device::BluetoothUUID>>::From(
|
| web_options.optionalServices);
|
|
|