diff options
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/bluetooth_adapter_mac.mm | 21 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_mac.mm | 15 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_profile_mac.mm | 11 |
3 files changed, 3 insertions, 44 deletions
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 6fb2b44..4ae7910 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -14,6 +14,7 @@ #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" #include "base/location.h" +#include "base/mac/sdk_forward_declarations.h" #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" @@ -24,26 +25,6 @@ #include "device/bluetooth/bluetooth_socket_mac.h" #include "device/bluetooth/bluetooth_uuid.h" -// Replicate specific 10.7 SDK declarations for building with prior SDKs. -#if !defined(MAC_OS_X_VERSION_10_7) || \ -MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - -@interface IOBluetoothHostController (LionSDKDeclarations) -- (NSString*)nameAsString; -- (BluetoothHCIPowerState)powerState; -@end - -@protocol IOBluetoothDeviceInquiryDelegate -- (void)deviceInquiryStarted:(IOBluetoothDeviceInquiry*)sender; -- (void)deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry*)sender - device:(IOBluetoothDevice*)device; -- (void)deviceInquiryComplete:(IOBluetoothDeviceInquiry*)sender - error:(IOReturn)error - aborted:(BOOL)aborted; -@end - -#endif // MAC_OS_X_VERSION_10_7 - @interface BluetoothAdapterMacDelegate : NSObject <IOBluetoothDeviceInquiryDelegate> { @private diff --git a/device/bluetooth/bluetooth_device_mac.mm b/device/bluetooth/bluetooth_device_mac.mm index 60574b0..1baa514 100644 --- a/device/bluetooth/bluetooth_device_mac.mm +++ b/device/bluetooth/bluetooth_device_mac.mm @@ -8,6 +8,7 @@ #include "base/basictypes.h" #include "base/hash.h" +#include "base/mac/sdk_forward_declarations.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -17,20 +18,6 @@ #include "device/bluetooth/bluetooth_socket_mac.h" #include "device/bluetooth/bluetooth_uuid.h" -// Replicate specific 10.7 SDK declarations for building with prior SDKs. -#if !defined(MAC_OS_X_VERSION_10_7) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - -@interface IOBluetoothDevice (LionSDKDeclarations) -- (NSString*)addressString; -- (unsigned int)classOfDevice; -- (BluetoothConnectionHandle)connectionHandle; -- (BluetoothHCIRSSIValue)rawRSSI; -- (NSArray*)services; -@end - -#endif // MAC_OS_X_VERSION_10_7 - // Undocumented API for accessing the Bluetooth transmit power level. // Similar to the API defined here [ http://goo.gl/20Q5vE ]. @interface IOBluetoothHostController (UndocumentedAPI) diff --git a/device/bluetooth/bluetooth_profile_mac.mm b/device/bluetooth/bluetooth_profile_mac.mm index 5ac6414..288239f 100644 --- a/device/bluetooth/bluetooth_profile_mac.mm +++ b/device/bluetooth/bluetooth_profile_mac.mm @@ -11,6 +11,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" +#include "base/mac/sdk_forward_declarations.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" @@ -18,16 +19,6 @@ #include "device/bluetooth/bluetooth_device_mac.h" #include "device/bluetooth/bluetooth_socket_mac.h" -// Replicate specific 10.7 SDK declarations for building with prior SDKs. -#if !defined(MAC_OS_X_VERSION_10_7) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - -@interface IOBluetoothDevice (LionSDKDeclarations) -- (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids; -@end - -#endif // MAC_OS_X_VERSION_10_7 - namespace device { namespace { |