| Index: device/bluetooth/bluetooth_device_chromeos.h
|
| diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
|
| index 156d9ea1cc4c785cf87ad1cacc60022cf34046fa..1581cdb0f3334fc38f4d5dd3248a0bfcbd2885b6 100644
|
| --- a/device/bluetooth/bluetooth_device_chromeos.h
|
| +++ b/device/bluetooth/bluetooth_device_chromeos.h
|
| @@ -7,14 +7,20 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "base/sequenced_task_runner.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "chromeos/dbus/bluetooth_gatt_service_client.h"
|
| #include "dbus/object_path.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
|
|
| +namespace device {
|
| +class BluetoothSocketThread;
|
| +} // namespace device
|
| +
|
| namespace chromeos {
|
|
|
| class BluetoothAdapterChromeOS;
|
| @@ -90,8 +96,11 @@ class BluetoothDeviceChromeOS
|
| private:
|
| friend class BluetoothAdapterChromeOS;
|
|
|
| - BluetoothDeviceChromeOS(BluetoothAdapterChromeOS* adapter,
|
| - const dbus::ObjectPath& object_path);
|
| + BluetoothDeviceChromeOS(
|
| + BluetoothAdapterChromeOS* adapter,
|
| + const dbus::ObjectPath& object_path,
|
| + scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
| + scoped_refptr<device::BluetoothSocketThread> socket_thread);
|
| virtual ~BluetoothDeviceChromeOS();
|
|
|
| // BluetoothGattServiceClient::Observer overrides.
|
| @@ -169,6 +178,10 @@ class BluetoothDeviceChromeOS
|
| // Number of ongoing calls to Connect().
|
| int num_connecting_calls_;
|
|
|
| + // UI thread task runner and socket thread object used to create sockets.
|
| + scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
|
| + scoped_refptr<device::BluetoothSocketThread> socket_thread_;
|
| +
|
| // During pairing this is set to an object that we don't own, but on which
|
| // we can make method calls to request, display or confirm PIN Codes and
|
| // Passkeys. Generally it is the object that owns this one.
|
|
|