| Index: components/wifi/wifi_service_mac.mm
|
| diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm
|
| index dc5704392ffdc2d6d9087774bd8d38de925d51ac..837f21d7ef3246d710a1e979e0d157a2158fc9c6 100644
|
| --- a/components/wifi/wifi_service_mac.mm
|
| +++ b/components/wifi/wifi_service_mac.mm
|
| @@ -12,40 +12,12 @@
|
| #include "base/mac/foundation_util.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| +#include "base/mac/sdk_forward_declarations.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "components/onc/onc_constants.h"
|
| #include "components/wifi/network_properties.h"
|
|
|
| -#if !defined(MAC_OS_X_VERSION_10_7) || \
|
| - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
|
| -
|
| -// Local definitions of API added in Mac OS X 10.7
|
| -
|
| -@interface CWInterface (LionAPI)
|
| -- (BOOL)associateToNetwork:(CWNetwork*)network
|
| - password:(NSString*)password
|
| - error:(NSError**)error;
|
| -- (NSSet*)scanForNetworksWithName:(NSString*)networkName
|
| - error:(NSError**)error;
|
| -@end
|
| -
|
| -enum CWChannelBand {
|
| - kCWChannelBandUnknown = 0,
|
| - kCWChannelBand2GHz = 1,
|
| - kCWChannelBand5GHz = 2,
|
| -};
|
| -
|
| -@interface CWChannel : NSObject
|
| -@property(readonly) CWChannelBand channelBand;
|
| -@end
|
| -
|
| -@interface CWNetwork (LionAPI)
|
| -@property(readonly) CWChannel* wlanChannel;
|
| -@end
|
| -
|
| -#endif // 10.7
|
| -
|
| namespace wifi {
|
|
|
| // Implementation of WiFiService for Mac OS X.
|
|
|