Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(726)

Unified Diff: content/browser/bluetooth/bluetooth_blacklist.h

Issue 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device
Patch Set: Change ref to pointer Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/bluetooth/bluetooth_blacklist.h
diff --git a/content/browser/bluetooth/bluetooth_blacklist.h b/content/browser/bluetooth/bluetooth_blacklist.h
index d363d86cfb967d3e18884649b441bc413890c619..ebc01dafe63b4926e6fcab07fd7422f25ccefe18 100644
--- a/content/browser/bluetooth/bluetooth_blacklist.h
+++ b/content/browser/bluetooth/bluetooth_blacklist.h
@@ -13,11 +13,10 @@
#include "base/strings/string_piece.h"
#include "content/common/content_export.h"
#include "device/bluetooth/bluetooth_uuid.h"
+#include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
namespace content {
-struct BluetoothScanFilter;
-
// Implements the Web Bluetooth Blacklist policy as defined in the Web Bluetooth
// specification:
// https://webbluetoothcg.github.io/web-bluetooth/#the-gatt-blacklist
@@ -65,7 +64,8 @@ class CONTENT_EXPORT BluetoothBlacklist final {
// Returns if any UUID in a set of filters is excluded from all operations.
// UUID must be valid.
- bool IsExcluded(const std::vector<content::BluetoothScanFilter>&);
+ bool IsExcluded(
+ const mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>& filters);
// Returns if a UUID is excluded from read operations. UUID must be valid.
bool IsExcludedFromReads(const device::BluetoothUUID&) const;
@@ -73,8 +73,10 @@ class CONTENT_EXPORT BluetoothBlacklist final {
// Returns if a UUID is excluded from write operations. UUID must be valid.
bool IsExcludedFromWrites(const device::BluetoothUUID&) const;
- // Modifies a list of UUIDs, removing any UUIDs with Value::EXCLUDE.
- void RemoveExcludedUuids(std::vector<device::BluetoothUUID>*);
+ // Modifies |options->optional_services|, removing any UUIDs with
+ // Value::EXCLUDE.
+ void RemoveExcludedUUIDs(
+ blink::mojom::WebBluetoothRequestDeviceOptions* options);
// Size of blacklist.
size_t size() { return blacklisted_uuids_.size(); }
« no previous file with comments | « content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc ('k') | content/browser/bluetooth/bluetooth_blacklist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698