Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h

Issue 788193004: chromeos/dbus: Update Bluetooth GATT API clients to upstream definition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
index ab0ce0b3650c093a1b1623f675cb75ae816ab45f..da5a971b835eb33170c9e807dbfafb06b857c969 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/memory/weak_ptr.h"
-#include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
#include "chromeos/dbus/bluetooth_gatt_descriptor_client.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
@@ -35,7 +34,6 @@ class BluetoothRemoteGattServiceChromeOS;
// platform.
class BluetoothRemoteGattCharacteristicChromeOS
: public device::BluetoothGattCharacteristic,
- public BluetoothGattCharacteristicClient::Observer,
public BluetoothGattDescriptorClient::Observer {
public:
// device::BluetoothGattCharacteristic overrides.
@@ -81,21 +79,14 @@ class BluetoothRemoteGattCharacteristicChromeOS
const dbus::ObjectPath& object_path);
virtual ~BluetoothRemoteGattCharacteristicChromeOS();
- // BluetoothGattCharacteristicClient::Observer overrides.
- virtual void GattCharacteristicValueUpdated(
- const dbus::ObjectPath& object_path,
- const std::vector<uint8>& value) override;
-
// BluetoothGattDescriptorClient::Observer overrides.
virtual void GattDescriptorAdded(
const dbus::ObjectPath& object_path) override;
virtual void GattDescriptorRemoved(
const dbus::ObjectPath& object_path) override;
-
- // Called by dbus:: on successful completion of a request to read
- // the characteristic value.
- void OnValueSuccess(const ValueCallback& callback,
- const std::vector<uint8>& value);
+ virtual void GattDescriptorPropertyChanged(
+ const dbus::ObjectPath& object_path,
+ const std::string& property_name) override;
// Called by dbus:: on unsuccessful completion of a request to read or write
// the characteristic value.
@@ -132,10 +123,6 @@ class BluetoothRemoteGattCharacteristicChromeOS
// The GATT service this GATT characteristic belongs to.
BluetoothRemoteGattServiceChromeOS* service_;
- // The cached characteristic value based on the most recent read or
- // notification.
- std::vector<uint8> cached_value_;
-
// The total number of currently active value update sessions.
size_t num_notify_sessions_;

Powered by Google App Engine
This is Rietveld 408576698