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

Unified Diff: device/bluetooth/bluez/bluetooth_device_bluez.h

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 4 years 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
Index: device/bluetooth/bluez/bluetooth_device_bluez.h
diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.h b/device/bluetooth/bluez/bluetooth_device_bluez.h
index d0cc1fac91c2a4245e306da8af3613848cf7e759..38a168cc5a431993ffb0e72103b1575126294d41 100644
--- a/device/bluetooth/bluez/bluetooth_device_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_device_bluez.h
@@ -49,6 +49,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ
using GetServiceRecordsErrorCallback =
base::Callback<void(BluetoothServiceRecordBlueZ::ErrorCode)>;
+ BluetoothDeviceBlueZ(
+ BluetoothAdapterBlueZ* adapter,
+ const dbus::ObjectPath& object_path,
+ scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+ scoped_refptr<device::BluetoothSocketThread> socket_thread);
+ ~BluetoothDeviceBlueZ() override;
+
// BluetoothDevice override
uint32_t GetBluetoothClass() const override;
device::BluetoothTransport GetType() const override;
@@ -158,14 +165,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceBlueZ
private:
friend class BluetoothAdapterBlueZ;
-
- BluetoothDeviceBlueZ(
- BluetoothAdapterBlueZ* adapter,
- const dbus::ObjectPath& object_path,
- scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
- scoped_refptr<device::BluetoothSocketThread> socket_thread);
- ~BluetoothDeviceBlueZ() override;
-
// bluez::BluetoothGattServiceClient::Observer overrides
void GattServiceAdded(const dbus::ObjectPath& object_path) override;
void GattServiceRemoved(const dbus::ObjectPath& object_path) override;

Powered by Google App Engine
This is Rietveld 408576698