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

Unified Diff: device/bluetooth/bluetooth_low_energy_device_mac.h

Issue 1246913006: Bringing 4 more BluetoothTest.* unit tests to Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scheibtest
Patch Set: Created 5 years, 5 months 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_low_energy_device_mac.h
diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.h b/device/bluetooth/bluetooth_low_energy_device_mac.h
index 502e082a185b97c6fb21cdde24ed75fad7ec1878..8c5a9763bf60cb7fa55481f8f38dfa511c527c2b 100644
--- a/device/bluetooth/bluetooth_low_energy_device_mac.h
+++ b/device/bluetooth/bluetooth_low_energy_device_mac.h
@@ -24,7 +24,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
: public BluetoothDeviceMac {
public:
BluetoothLowEnergyDeviceMac(CBPeripheral* peripheral,
- NSDictionary* advertisementData,
+ NSDictionary* advertisement_data,
int rssi);
~BluetoothLowEnergyDeviceMac() override;
@@ -81,7 +81,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
// Updates information about the device.
virtual void Update(CBPeripheral* peripheral,
- NSDictionary* advertisementData,
+ NSDictionary* advertisement_data,
int rssi);
static std::string GetPeripheralIdentifier(CBPeripheral* peripheral);
@@ -118,6 +118,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
// Stores the time of the most recent call to Update().
base::scoped_nsobject<NSDate> last_update_time_;
+ // The services (identified by UUIDs) that this device provides.
+ UUIDList uuids_;
scheib 2015/07/23 18:15:25 For clarity rename this to advertised_uuids_ -- we
krstnmnlsn 2015/07/23 22:03:29 sure. And you mean we will put uuids we discover
scheib 2015/07/23 22:15:39 GetUUIDs will need to return the merge of advertis
+
DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDeviceMac);
};

Powered by Google App Engine
This is Rietveld 408576698