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

Unified Diff: content/browser/bluetooth/bluetooth_device_chooser_controller.cc

Issue 2789243002: Rename BluetoothScanFilterInit to BluetoothLEScanFilterInit (Closed)
Patch Set: Codereview: nit Created 3 years, 8 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_device_chooser_controller.cc
diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
index 7221db3b0d3fb12acd46bf314454c9670ee11b55..5c35cc3619b7178d8b40f63f28d9aea9f7b930a2 100644
--- a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
+++ b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
@@ -115,7 +115,7 @@ void LogRequestDeviceOptions(
}
bool IsEmptyOrInvalidFilter(
- const blink::mojom::WebBluetoothScanFilterPtr& filter) {
+ const blink::mojom::WebBluetoothLeScanFilterPtr& filter) {
// At least one member needs to be present.
if (!filter->name && !filter->name_prefix && !filter->services)
return true;
@@ -134,8 +134,8 @@ bool IsEmptyOrInvalidFilter(
}
bool HasEmptyOrInvalidFilter(
- const base::Optional<std::vector<blink::mojom::WebBluetoothScanFilterPtr>>&
- filters) {
+ const base::Optional<
+ std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters) {
if (!filters) {
return true;
}
@@ -157,7 +157,7 @@ bool IsOptionsInvalid(
bool MatchesFilter(const std::string* device_name,
const UUIDSet& device_uuids,
- const blink::mojom::WebBluetoothScanFilterPtr& filter) {
+ const blink::mojom::WebBluetoothLeScanFilterPtr& filter) {
if (filter->name) {
if (device_name == nullptr)
return false;
@@ -187,8 +187,8 @@ bool MatchesFilter(const std::string* device_name,
bool MatchesFilters(
const std::string* device_name,
const UUIDSet& device_uuids,
- const base::Optional<std::vector<blink::mojom::WebBluetoothScanFilterPtr>>&
- filters) {
+ const base::Optional<
+ std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters) {
DCHECK(!HasEmptyOrInvalidFilter(filters));
for (const auto& filter : filters.value()) {
if (MatchesFilter(device_name, device_uuids, filter)) {
@@ -199,8 +199,8 @@ bool MatchesFilters(
}
std::unique_ptr<device::BluetoothDiscoveryFilter> ComputeScanFilter(
- const base::Optional<std::vector<blink::mojom::WebBluetoothScanFilterPtr>>&
- filters) {
+ const base::Optional<
+ std::vector<blink::mojom::WebBluetoothLeScanFilterPtr>>& filters) {
std::unordered_set<BluetoothUUID, device::BluetoothUUIDHash> services;
if (filters) {
« no previous file with comments | « content/browser/bluetooth/bluetooth_blocklist_unittest.cc ('k') | content/browser/bluetooth/bluetooth_metrics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698