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

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: --set-upstream-to=origin/master 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_adapter_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 eda84cb42d3412203891b8b559c5e2ac0c49cd18..af466f2509f0045430ce29ad623c21ef3d403258 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_chromeos.h
@@ -47,6 +47,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
static base::WeakPtr<BluetoothAdapter> CreateAdapter();
// BluetoothAdapter:
+ void Shutdown();
void DeleteOnCorrectThread() const override;
void AddObserver(device::BluetoothAdapter::Observer* observer) override;
void RemoveObserver(device::BluetoothAdapter::Observer* observer) override;
@@ -240,6 +241,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
// ended (with either success or failure).
void ProcessQueuedDiscoveryRequests();
+ // Set in |Shutdown()|, makes IsPresent()| return false.
+ bool dbus_is_shutdown_;
+
// Number of discovery sessions that have been added.
int num_discovery_sessions_;
« no previous file with comments | « device/bluetooth/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_adapter_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698