device/bluetooth/bluetooth_adapter.h - Issue 1415573014: Reland "Add Linux support for the Bluetooth API"

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.h

Issue 1415573014: Reland "Add Linux support for the Bluetooth API" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fix. Created 5 years, 1 month 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.h

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

index 63969fc3882370656ec79862a31874b166e29bef..71b44b9942134e24beb34aca4016f363fed4db56 100644

--- a/device/bluetooth/bluetooth_adapter.h

+++ b/device/bluetooth/bluetooth_adapter.h

@@ -221,7 +221,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter

// Returns a weak pointer to an existing adapter for testing purposes only.

base::WeakPtr<BluetoothAdapter> GetWeakPtrForTesting();

-#if defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

// Shutdown the adapter: tear down and clean up all objects owned by

// BluetoothAdapter. After this call, the BluetoothAdapter will behave as if

// no Bluetooth controller exists in the local system. |IsPresent| will return