| Index: device/bluetooth/bluetooth_device.h
|
| diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
|
| index bfbf0dce8f89133f2d0f32ac4391ad48a97a4573..cf4c97f4866ce7f41c1b1c1370691d6ff1f3f3d1 100644
|
| --- a/device/bluetooth/bluetooth_device.h
|
| +++ b/device/bluetooth/bluetooth_device.h
|
| @@ -418,10 +418,10 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDevice {
|
| // returned BluetoothGattConnection will be automatically marked as inactive.
|
| // To monitor the state of the connection, observe the
|
| // BluetoothAdapter::Observer::DeviceChanged method.
|
| - typedef base::Callback<void(scoped_ptr<BluetoothGattConnection>)>
|
| - GattConnectionCallback;
|
| - virtual void CreateGattConnection(const GattConnectionCallback& callback,
|
| - const ConnectErrorCallback& error_callback);
|
| + typedef base::Callback<void()> GattConnectionCallback;
|
| + virtual scoped_ptr<device::BluetoothGattConnection> CreateGattConnection(
|
| + const GattConnectionCallback& callback,
|
| + const ConnectErrorCallback& error_callback);
|
|
|
| // Returns the list of discovered GATT services.
|
| virtual std::vector<BluetoothGattService*> GetGattServices() const;
|
| @@ -463,7 +463,12 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDevice {
|
| // Subclasses must also call DidConnectGatt, DidFailToConnectGatt, or
|
| // DidDisconnectGatt immediately or asynchronously as the connection state
|
| // changes.
|
| - virtual void CreateGattConnectionImpl() = 0;
|
| + virtual scoped_ptr<device::BluetoothGattConnection>
|
| + CreateGattConnectionImpl() = 0;
|
| +
|
| + // Return new BluetoothGattConnection for already connected BluetoothDevice.
|
| + virtual scoped_ptr<device::BluetoothGattConnection>
|
| + ExistingGattConnection() = 0;
|
|
|
| // Disconnects GATT connection on platforms that maintain a specific GATT
|
| // connection.
|
|
|