diff options
author | ccameron <ccameron@chromium.org> | 2015-02-07 00:33:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 08:34:13 +0000 |
commit | 46b4983d6119b1e4b0c441c61fcbe10b4eb56335 (patch) | |
tree | 8cef71a289cf434c45771c99ee8003bdf08dea4d /base/mac | |
parent | 42f79f8b08a99190627f3a67e86a378987104a4a (diff) | |
download | chromium_src-46b4983d6119b1e4b0c441c61fcbe10b4eb56335.zip chromium_src-46b4983d6119b1e4b0c441c61fcbe10b4eb56335.tar.gz chromium_src-46b4983d6119b1e4b0c441c61fcbe10b4eb56335.tar.bz2 |
Revert of Added bluetooth LE support on Mac platform (patchset #13 id:340001 of https://codereview.chromium.org/791763005/)
Reason for revert:
Breaks compile:
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder/builds/17750
../../device/bluetooth/bluetooth_low_energy_discovery_manager_mac.mm:119:30: error: class method '+UUIDWithString:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access]
CBUUID* uuid = [CBUUID UUIDWithString:uuidString];
^~~~~~~~~~~~~~
../../device/bluetooth/bluetooth_low_energy_device_mac.mm:82:39: error: use of undeclared identifier 'CBAdvertisementDataIsConnectable'
[advertisementData objectForKey:CBAdvertisementDataIsConnectable];
^
../../device/bluetooth/bluetooth_low_energy_device_mac.mm:85:39: error: use of undeclared identifier 'CBAdvertisementDataServiceDataKey'
[advertisementData objectForKey:CBAdvertisementDataServiceDataKey];
^
2 errors generated.
Original issue's description:
> Added bluetooth LE support on Mac platform
>
> BUG=449682
>
> Committed: https://crrev.com/42f79f8b08a99190627f3a67e86a378987104a4a
> Cr-Commit-Position: refs/heads/master@{#315190}
TBR=armansito@chromium.org,avi@chromium.org,groby@chromium.org,dvh@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=449682
Review URL: https://codereview.chromium.org/871843009
Cr-Commit-Position: refs/heads/master@{#315191}
Diffstat (limited to 'base/mac')
-rw-r--r-- | base/mac/sdk_forward_declarations.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h index 294f206..faa36ea 100644 --- a/base/mac/sdk_forward_declarations.h +++ b/base/mac/sdk_forward_declarations.h @@ -219,52 +219,6 @@ BASE_EXPORT extern "C" NSString* const - (void)windowDidFailToExitFullScreen:(NSWindow*)window; @end -enum { - CBPeripheralStateDisconnected = 0, - CBPeripheralStateConnecting, - CBPeripheralStateConnected, -}; -typedef NSInteger CBPeripheralState; - -@interface CBPeripheral : NSObject -@property(readonly, nonatomic) CFUUIDRef UUID; -@property(retain, readonly) NSString* name; -@property(readonly) BOOL isConnected; -@end - -enum { - CBCentralManagerStateUnknown = 0, - CBCentralManagerStateResetting, - CBCentralManagerStateUnsupported, - CBCentralManagerStateUnauthorized, - CBCentralManagerStatePoweredOff, - CBCentralManagerStatePoweredOn, -}; -typedef NSInteger CBCentralManagerState; - -@protocol CBCentralManagerDelegate; - -@interface CBCentralManager : NSObject -@property(readonly) CBCentralManagerState state; -- (id)initWithDelegate:(id<CBCentralManagerDelegate>)delegate - queue:(dispatch_queue_t)queue; -- (void)scanForPeripheralsWithServices:(NSArray*)serviceUUIDs - options:(NSDictionary*)options; -- (void)stopScan; -@end - -@protocol CBCentralManagerDelegate<NSObject> -- (void)centralManagerDidUpdateState:(CBCentralManager*)central; -- (void)centralManager:(CBCentralManager*)central - didDiscoverPeripheral:(CBPeripheral*)peripheral - advertisementData:(NSDictionary*)advertisementData - RSSI:(NSNumber*)RSSI; -@end - -@interface CBUUID : NSObject -@property(nonatomic, readonly) NSData* data; -@end - #endif // MAC_OS_X_VERSION_10_7 #if !defined(MAC_OS_X_VERSION_10_8) || \ @@ -278,10 +232,6 @@ enum { - (CGColorRef)CGColor; @end -@interface NSUUID : NSObject -- (NSString*)UUIDString; -@end - #endif // MAC_OS_X_VERSION_10_8 @@ -354,10 +304,6 @@ enum { NSWorkspaceLaunchWithErrorPresentation = 0x00000040 }; -@interface CBPeripheral (MavericksSDK) -@property(readonly, nonatomic) NSUUID* identifier; -@end - #else // !MAC_OS_X_VERSION_10_9 typedef enum { @@ -399,10 +345,6 @@ BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb; BASE_EXPORT extern "C" NSString* const NSAppearanceNameVibrantDark; -@interface CBUUID (YosemiteSDK) -- (NSString*)UUIDString; -@end - #endif // MAC_OS_X_VERSION_10_10 #endif // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_ |