| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h
|
| index c690aeab8ff6daff1bbb23298e56bc7b1202bf36..ca3aa3000cb4ef9806996c163ed5005d7676782c 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h
|
| @@ -48,10 +48,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicMac
|
| std::vector<BluetoothRemoteGattDescriptor*> GetDescriptors() const override;
|
| BluetoothRemoteGattDescriptor* GetDescriptor(
|
| const std::string& identifier) const override;
|
| - void StartNotifySession(const NotifySessionCallback& callback,
|
| - const ErrorCallback& error_callback) override;
|
| - void StopNotifySession(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,
|
| @@ -126,17 +122,14 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicMac
|
| std::pair<ValueCallback, ErrorCallback> read_characteristic_value_callbacks_;
|
| // WriteRemoteCharacteristic request callbacks.
|
| std::pair<base::Closure, ErrorCallback> write_characteristic_value_callbacks_;
|
| - // Stores StartNotifySession request callbacks.
|
| - typedef std::pair<NotifySessionCallback, ErrorCallback>
|
| - PendingStartNotifyCall;
|
| - std::vector<PendingStartNotifyCall> start_notify_session_callbacks_;
|
| - // Flag indicates if GATT event registration is in progress.
|
| - bool start_notifications_in_progress_;
|
| + // Stores SubscribeToNotifications request callbacks.
|
| + typedef std::pair<base::Closure, ErrorCallback> PendingNotifyCallback;
|
| + // Stores SubscribeToNotifications request callback.
|
| + PendingNotifyCallback subscribe_to_notification_callback_;
|
| // Map of descriptors, keyed by descriptor identifier.
|
| std::unordered_map<std::string,
|
| std::unique_ptr<BluetoothRemoteGattDescriptorMac>>
|
| gatt_descriptor_macs_;
|
| - base::WeakPtrFactory<BluetoothRemoteGattCharacteristicMac> weak_ptr_factory_;
|
| };
|
|
|
| } // namespace device
|
|
|