Index: device/bluetooth/bluetooth_device_chromeos.h |
diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h |
index 358b1cd5a661d312e7398f2fb6669b884ec3591a..6969b33dd29c39fac106aae8109471adba175925 100644 |
--- a/device/bluetooth/bluetooth_device_chromeos.h |
+++ b/device/bluetooth/bluetooth_device_chromeos.h |
@@ -76,7 +76,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS |
const device::BluetoothUUID& uuid, |
const ConnectToServiceCallback& callback, |
const ConnectToServiceErrorCallback& error_callback) override; |
- void CreateGattConnection( |
+ scoped_ptr<device::BluetoothGattConnection> CreateGattConnection( |
const GattConnectionCallback& callback, |
const ConnectErrorCallback& error_callback) override; |
void Pair(device::BluetoothDevice::PairingDelegate* pairing_delegate, |
@@ -105,7 +105,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS |
protected: |
// BluetoothDevice override |
std::string GetDeviceName() const override; |
- void CreateGattConnectionImpl() override; |
+ scoped_ptr<device::BluetoothGattConnection> CreateGattConnectionImpl() |
+ override; |
+ scoped_ptr<device::BluetoothGattConnection> ExistingGattConnection() override; |
void DisconnectGatt() override; |
private: |
@@ -139,7 +141,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS |
const ConnectErrorCallback& error_callback); |
void OnConnect(bool after_pairing, |
const base::Closure& callback); |
- void OnCreateGattConnection(const GattConnectionCallback& callback); |
+ void OnCreateGattConnection(device::BluetoothGattConnection* conn, |
+ const GattConnectionCallback& callback); |
void OnConnectError(bool after_pairing, |
const ConnectErrorCallback& error_callback, |
const std::string& error_name, |