diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/device/bluetooth/bluetooth_adapter_winrt.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/device/bluetooth/bluetooth_adapter_winrt.h')
| -rw-r--r-- | chromium/device/bluetooth/bluetooth_adapter_winrt.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chromium/device/bluetooth/bluetooth_adapter_winrt.h b/chromium/device/bluetooth/bluetooth_adapter_winrt.h index 9bb463abbf9..fbb47308d9d 100644 --- a/chromium/device/bluetooth/bluetooth_adapter_winrt.h +++ b/chromium/device/bluetooth/bluetooth_adapter_winrt.h @@ -198,7 +198,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterWinrt : public BluetoothAdapter { ABI::Windows::Devices::Bluetooth::Advertisement:: IBluetoothLEAdvertisementWatcher* watcher, ABI::Windows::Devices::Bluetooth::Advertisement:: - IBluetoothLEAdvertisementReceivedEventArgs* received); + IBluetoothLEAdvertisementReceivedEventArgs* args); + + void OnAdvertisementWatcherStopped( + ABI::Windows::Devices::Bluetooth::Advertisement:: + IBluetoothLEAdvertisementWatcher* watcher, + ABI::Windows::Devices::Bluetooth::Advertisement:: + IBluetoothLEAdvertisementWatcherStoppedEventArgs* args); void OnRegisterAdvertisement(BluetoothAdvertisement* advertisement, const CreateAdvertisementCallback& callback); @@ -212,7 +218,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterWinrt : public BluetoothAdapter { void TryRemovePoweredRadioEventHandlers(); - void RemoveAdvertisementReceivedHandler(); + void RemoveAdvertisementWatcherEventHandlers(); bool is_initialized_ = false; bool radio_access_allowed_ = false; @@ -237,7 +243,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterWinrt : public BluetoothAdapter { std::vector<scoped_refptr<BluetoothAdvertisement>> pending_advertisements_; - EventRegistrationToken advertisement_received_token_; + base::Optional<EventRegistrationToken> advertisement_received_token_; + base::Optional<EventRegistrationToken> advertisement_watcher_stopped_token_; Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::Advertisement:: IBluetoothLEAdvertisementWatcher> ble_advertisement_watcher_; |