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

Unified Diff: device/bluetooth/bluetooth_discovery_filter.cc

Issue 2063353002: device/bluetooth: split out transport enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: renaming header, moving TransportMask back into filter Created 4 years, 6 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: device/bluetooth/bluetooth_discovery_filter.cc
diff --git a/device/bluetooth/bluetooth_discovery_filter.cc b/device/bluetooth/bluetooth_discovery_filter.cc
index 8b96a18984732be45231169111091cb32b214f5d..fe6ce571792652029063ea9980e521264c42748e 100644
--- a/device/bluetooth/bluetooth_discovery_filter.cc
+++ b/device/bluetooth/bluetooth_discovery_filter.cc
@@ -6,6 +6,8 @@
#include <memory>
+#include "device/bluetooth/bluetooth_types.h"
+
namespace device {
BluetoothDiscoveryFilter::BluetoothDiscoveryFilter(TransportMask transport) {
@@ -106,7 +108,8 @@ BluetoothDiscoveryFilter::Merge(
return result;
}
- result.reset(new BluetoothDiscoveryFilter(Transport::TRANSPORT_DUAL));
+ result.reset(
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
if (!filter_a || !filter_b || filter_a->IsDefault() ||
filter_b->IsDefault()) {
@@ -173,7 +176,7 @@ bool BluetoothDiscoveryFilter::Equals(
bool BluetoothDiscoveryFilter::IsDefault() const {
return !(rssi_.get() || pathloss_.get() || uuids_.size() ||
- transport_ != Transport::TRANSPORT_DUAL);
+ transport_ != BluetoothTransport::TRANSPORT_DUAL);
}
} // namespace device

Powered by Google App Engine
This is Rietveld 408576698