device/bluetooth/bluetooth_adapter.cc - Issue 2063353002: device/bluetooth: split out transport enum

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_adapter.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:

Index: device/bluetooth/bluetooth_adapter.cc

diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc

index 09127f981cb48ec266570c74a803285da6f33141..19b70d9184e24cf308106a31c4373dfbc90366a0 100644

--- a/device/bluetooth/bluetooth_adapter.cc

+++ b/device/bluetooth/bluetooth_adapter.cc

@@ -11,6 +11,7 @@

#include "base/metrics/histogram_macros.h"

#include "base/stl_util.h"

#include "build/build_config.h"

+#include "device/bluetooth/bluetooth_common.h"

#include "device/bluetooth/bluetooth_device.h"

#include "device/bluetooth/bluetooth_discovery_session.h"

#include "device/bluetooth/bluetooth_discovery_session_outcome.h"

@@ -352,8 +353,7 @@ BluetoothAdapter::GetMergedDiscoveryFilterHelper(

if (first_merge) {

first_merge = false;

if (curr_filter) {

- result.reset(new BluetoothDiscoveryFilter(

- BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL));

+ result.reset(new BluetoothDiscoveryFilter(BLUETOOTH_TRANSPORT_DUAL));

result->CopyFrom(*curr_filter);

}

continue;