| Index: device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
|
| diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
|
| index b5e09ce1b2583a8cee489c645002846c998c4316..0687b0d2d31788a2877e4e74f1497ced97baffa3 100644
|
| --- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
|
| +++ b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
|
| @@ -57,14 +57,6 @@ class BluetoothRemoteGattCharacteristicBlueZ
|
| const override;
|
| device::BluetoothRemoteGattDescriptor* GetDescriptor(
|
| const std::string& identifier) const override;
|
| - void StartNotifySession(const NotifySessionCallback& callback,
|
| - const ErrorCallback& error_callback) override;
|
| - // Removes one value update session and invokes |callback| on completion. This
|
| - // decrements the session reference count by 1 and if the number reaches 0,
|
| - // makes a call to the subsystem to stop notifications from this
|
| - // characteristic.
|
| - void StopNotifySession(device::BluetoothGattNotifySession* session,
|
| - const base::Closure& callback) override;
|
| void ReadRemoteCharacteristic(const ValueCallback& callback,
|
| const ErrorCallback& error_callback) override;
|
| void WriteRemoteCharacteristic(const std::vector<uint8_t>& value,
|
| @@ -100,7 +92,7 @@ class BluetoothRemoteGattCharacteristicBlueZ
|
|
|
| // Called by dbus:: on successful completion of a request to start
|
| // notifications.
|
| - void OnStartNotifySuccess(const NotifySessionCallback& callback);
|
| + void OnStartNotifySuccess(const base::Closure& callback);
|
|
|
| // Called by dbus:: on unsuccessful completion of a request to start
|
| // notifications.
|
| @@ -118,24 +110,14 @@ class BluetoothRemoteGattCharacteristicBlueZ
|
| const std::string& error_name,
|
| const std::string& error_message);
|
|
|
| - // Calls StartNotifySession for each queued request.
|
| - void ProcessStartNotifyQueue();
|
| -
|
| // Called by dbus:: on unsuccessful completion of a request to read or write
|
| // the characteristic value.
|
| void OnError(const ErrorCallback& error_callback,
|
| const std::string& error_name,
|
| const std::string& error_message);
|
|
|
| - // The total number of currently active value update sessions.
|
| - size_t num_notify_sessions_;
|
| -
|
| - // Calls to StartNotifySession that are pending. This can happen during the
|
| - // first remote call to start notifications.
|
| - std::queue<PendingStartNotifyCall> pending_start_notify_calls_;
|
| -
|
| - // True, if a Start or Stop notify call to bluetoothd is currently pending.
|
| - bool notify_call_pending_;
|
| + // True, if there exists a Bluez notify session.
|
| + bool has_notify_session_;
|
|
|
| // TODO(rkc): Investigate and fix ownership of the descriptor objects in this
|
| // map. See crbug.com/604166.
|
|
|