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

Unified Diff: extensions/browser/api/bluetooth/bluetooth_private_api.cc

Issue 2063353002: device/bluetooth: split out transport enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing new use in components/arc/bluetooth 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: extensions/browser/api/bluetooth/bluetooth_private_api.cc
diff --git a/extensions/browser/api/bluetooth/bluetooth_private_api.cc b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
index c6296d9d384c78e8b4bde10fda4d94c2c321a7f4..0ba6c01ea85b57eb6363f62d9fc21372530ef396 100644
--- a/extensions/browser/api/bluetooth/bluetooth_private_api.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
@@ -13,6 +13,7 @@
#include "base/strings/string_util.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
+#include "device/bluetooth/bluetooth_common.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
#include "extensions/browser/api/bluetooth/bluetooth_api.h"
#include "extensions/browser/api/bluetooth/bluetooth_api_pairing_delegate.h"
@@ -410,18 +411,17 @@ bool BluetoothPrivateSetDiscoveryFilterFunction::DoWork(
// set, then create proper filter.
if (df_param.uuids.get() || df_param.rssi.get() || df_param.pathloss.get() ||
df_param.transport != bt_private::TransportType::TRANSPORT_TYPE_NONE) {
- uint8_t transport;
+ device::BluetoothTransport transport;
switch (df_param.transport) {
case bt_private::TransportType::TRANSPORT_TYPE_LE:
- transport = device::BluetoothDiscoveryFilter::Transport::TRANSPORT_LE;
+ transport = device::BLUETOOTH_TRANSPORT_LE;
break;
case bt_private::TransportType::TRANSPORT_TYPE_BREDR:
- transport =
- device::BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC;
+ transport = device::BLUETOOTH_TRANSPORT_CLASSIC;
break;
default: // TRANSPORT_TYPE_NONE is included here
- transport = device::BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL;
+ transport = device::BLUETOOTH_TRANSPORT_DUAL;
break;
}

Powered by Google App Engine
This is Rietveld 408576698