device/bluetooth/bluetooth_adapter_chromeos.h - Issue 848613003: bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS.

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

Issue 848613003: bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Limit shutdown to defined(CHROMEOS); add checks that methods aren't run after shutdown Created 5 years, 11 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

« device/bluetooth/bluetooth_adapter.cc ('K') | « device/bluetooth/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_adapter_chromeos.cc » ('j') | device/bluetooth/bluetooth_adapter_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_chromeos.h

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

index 0bcd6f741fe3e52368fa1ce2f421971f3a3d8057..06a1e9ffc2bb7f011fca92675f43f00dd9ca7865 100644

--- a/device/bluetooth/bluetooth_adapter_chromeos.h

+++ b/device/bluetooth/bluetooth_adapter_chromeos.h

@@ -44,6 +44,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS

static base::WeakPtr<BluetoothAdapter> CreateAdapter();

// BluetoothAdapter:

+ void OnDBusThreadManagerShutdown() override;

void DeleteOnCorrectThread() const override;

virtual void AddObserver(

device::BluetoothAdapter::Observer* observer) override;

@@ -241,6 +242,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS

// ended (with either success or failure).

void ProcessQueuedDiscoveryRequests();

+ // Set in |OnDBusThreadManagerShutdown()|, makes IsPresent()| return false.

+ bool dbus_is_shutdown_;

// Number of discovery sessions that have been added.

int num_discovery_sessions_;