diff options
| author | krstnmnlsn <krstnmnlsn@chromium.org> | 2015-08-06 12:11:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 19:12:29 +0000 |
| commit | 4847d81140922c2b5530e6c05ac3c1c020049c1c (patch) | |
| tree | 4592cdd549973aef6a80a9212dc7d56040520448 /base/mac | |
| parent | f839407c2338503a55905a91e6bdecdc665f63b2 (diff) | |
| download | chromium_src-4847d81140922c2b5530e6c05ac3c1c020049c1c.zip chromium_src-4847d81140922c2b5530e6c05ac3c1c020049c1c.tar.gz chromium_src-4847d81140922c2b5530e6c05ac3c1c020049c1c.tar.bz2 | |
Corrected the key used on |advertisement_data| in
BluetoothLowEnergyDeviceMac::Update(...) so that service UUIDs
are properly queried.
Also stopped clearing the device's |advertised_uuids_| in Update(...) because
CoreBluetooth returns the device data in separate chunks, and previous service
UUIDs were being cleared before we reported them.
BUG=516608
Review URL: https://codereview.chromium.org/1272503002
Cr-Commit-Position: refs/heads/master@{#342172}
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/sdk_forward_declarations.h | 2 | ||||
| -rw-r--r-- | base/mac/sdk_forward_declarations.mm | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h index e45ab43..1b12061 100644 --- a/base/mac/sdk_forward_declarations.h +++ b/base/mac/sdk_forward_declarations.h @@ -239,6 +239,7 @@ BASE_EXPORT extern NSString* const NSWindowDidExitFullScreenNotification; BASE_EXPORT extern NSString* const NSWindowDidChangeBackingPropertiesNotification; BASE_EXPORT extern NSString* const CBAdvertisementDataServiceDataKey; +BASE_EXPORT extern NSString* const CBAdvertisementDataServiceUUIDsKey; BASE_EXPORT extern NSString* const NSPreferredScrollerStyleDidChangeNotification; #endif // MAC_OS_X_VERSION_10_7 @@ -246,6 +247,7 @@ BASE_EXPORT extern NSString* const #if !defined(MAC_OS_X_VERSION_10_9) || \ MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_9 BASE_EXPORT extern NSString* const NSWindowDidChangeOcclusionStateNotification; +BASE_EXPORT extern NSString* const CBAdvertisementDataOverflowServiceUUIDsKey; BASE_EXPORT extern NSString* const CBAdvertisementDataIsConnectable; #endif // MAC_OS_X_VERSION_10_9 diff --git a/base/mac/sdk_forward_declarations.mm b/base/mac/sdk_forward_declarations.mm index 2e4b2d9..7c5e260 100644 --- a/base/mac/sdk_forward_declarations.mm +++ b/base/mac/sdk_forward_declarations.mm @@ -23,6 +23,8 @@ NSString* const NSWindowDidChangeBackingPropertiesNotification = NSString* const CBAdvertisementDataServiceDataKey = @"kCBAdvDataServiceData"; +NSString* const CBAdvertisementDataServiceUUIDsKey = @"kCBAdvDataServiceUUIDs"; + NSString* const NSPreferredScrollerStyleDidChangeNotification = @"NSPreferredScrollerStyleDidChangeNotification"; #endif // MAC_OS_X_VERSION_10_7 @@ -32,6 +34,9 @@ NSString* const NSPreferredScrollerStyleDidChangeNotification = NSString* const NSWindowDidChangeOcclusionStateNotification = @"NSWindowDidChangeOcclusionStateNotification"; +NSString* const CBAdvertisementDataOverflowServiceUUIDsKey = + @"kCBAdvDataOverflowServiceUUIDs"; + NSString* const CBAdvertisementDataIsConnectable = @"kCBAdvDataIsConnectable"; #endif // MAC_OS_X_VERSION_10_9 |