| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| index cb9ec172d8d2be6e67f040126bb59ee8666328da..27f8902da2657bdcb32eb99e2946c70a678c16ff 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| @@ -10,7 +10,7 @@
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "device/bluetooth/bluetooth_adapter_mac.h"
|
| #include "device/bluetooth/bluetooth_device_mac.h"
|
| -#include "device/bluetooth/bluetooth_gatt_notify_session.h"
|
| +#include "device/bluetooth/bluetooth_gatt_notify_session_mac.h"
|
| #include "device/bluetooth/bluetooth_remote_gatt_service_mac.h"
|
|
|
| namespace device {
|
| @@ -134,8 +134,8 @@
|
| const ErrorCallback& error_callback) {
|
| if (IsNotifying()) {
|
| VLOG(2) << "Already notifying. Creating notify session.";
|
| - std::unique_ptr<BluetoothGattNotifySession> notify_session(
|
| - new BluetoothGattNotifySession(weak_ptr_factory_.GetWeakPtr()));
|
| + std::unique_ptr<BluetoothGattNotifySessionMac> notify_session(
|
| + new BluetoothGattNotifySessionMac(weak_ptr_factory_.GetWeakPtr()));
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, base::Passed(std::move(notify_session))));
|
| @@ -221,22 +221,6 @@
|
| base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
|
| base::Unretained(this), nil));
|
| }
|
| -}
|
| -
|
| -void BluetoothRemoteGattCharacteristicMac::SubscribeToNotifications(
|
| - BluetoothRemoteGattDescriptor* ccc_descriptor,
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) {
|
| - // TODO(http://crbug.com/633191): Implement this method
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| -void BluetoothRemoteGattCharacteristicMac::UnsubscribeFromNotifications(
|
| - BluetoothRemoteGattDescriptor* ccc_descriptor,
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) {
|
| - // TODO(http://crbug.com/633191): Implement this method
|
| - NOTIMPLEMENTED();
|
| }
|
|
|
| void BluetoothRemoteGattCharacteristicMac::DidUpdateValue(NSError* error) {
|
| @@ -322,7 +306,7 @@
|
| return;
|
| }
|
| for (const auto& callback : reentrant_safe_callbacks) {
|
| - callback.first.Run(base::MakeUnique<BluetoothGattNotifySession>(
|
| + callback.first.Run(base::MakeUnique<BluetoothGattNotifySessionMac>(
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
| }
|
|
|