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

Unified Diff: device/bluetooth/bluetooth_device_chromeos.h

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-
Patch Set: Merge TOT Created 5 years, 3 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_device_android.cc ('k') | device/bluetooth/bluetooth_device_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device_chromeos.h
diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
index f937be7465ed94a91fd07e9d5c46a58c78ffe969..f8846cdb37e3fbb012da23aa0a38a4514adeb514 100644
--- a/device/bluetooth/bluetooth_device_chromeos.h
+++ b/device/bluetooth/bluetooth_device_chromeos.h
@@ -96,7 +96,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
const dbus::ObjectPath& object_path() const { return object_path_; }
// Returns the adapter which owns this device instance.
- BluetoothAdapterChromeOS* adapter() const { return adapter_; }
+ BluetoothAdapterChromeOS* adapter() const;
protected:
// BluetoothDevice override
@@ -173,9 +173,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
const std::string& error_name,
const std::string& error_message);
- // The adapter that owns this device instance.
- BluetoothAdapterChromeOS* adapter_;
-
// The dbus object path of the device object.
dbus::ObjectPath object_path_;
« no previous file with comments | « device/bluetooth/bluetooth_device_android.cc ('k') | device/bluetooth/bluetooth_device_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698