Fix SDK forward declarations after CL 530193004

base/mac/sdk_forward_declarations.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains forward declarations for items in later SDKs than the
 // default one with which Chromium is built (currently 10.6).
 // If you call any function from this header, be sure to check at runtime for
 // respondsToSelector: before calling these functions (else your code will crash
 // on older OS X versions that chrome still supports).
 
@@ skipping 134 matching lines @@
 enum CWChannelBand {
   kCWChannelBandUnknown = 0,
   kCWChannelBand2GHz = 1,
   kCWChannelBand5GHz = 2,
 };
 
 @interface CWChannel : NSObject
 @property(readonly) CWChannelBand channelBand;
 @end
 
+enum {
+   kCWSecurityNone = 0,
+   kCWSecurityWEP = 1,
+   kCWSecurityWPAPersonal = 2,
+   kCWSecurityWPAPersonalMixed = 3,
+   kCWSecurityWPA2Personal = 4,
+   kCWSecurityPersonal = 5,
+   kCWSecurityDynamicWEP = 6,
+   kCWSecurityWPAEnterprise = 7,
+   kCWSecurityWPAEnterpriseMixed = 8,
+   kCWSecurityWPA2Enterprise = 9,
+   kCWSecurityEnterprise = 10,
+   kCWSecurityUnknown = NSIntegerMax,
+};
+
+typedef NSInteger CWSecurity;
+
 @interface CWNetwork (LionSDK)
 @property(readonly) CWChannel* wlanChannel;
+@property(readonly) NSInteger rssiValue;
+- (BOOL)supportsSecurity:(CWSecurity)security;
 @end
 
 @interface IOBluetoothHostController (LionSDK)
 - (NSString*)nameAsString;
 - (BluetoothHCIPowerState)powerState;
 @end
 
 enum {
   kBluetoothFeatureLESupportedController = (1 << 6L),
 };
@@ skipping 83 matching lines @@
 
 enum {
   NSWindowOcclusionStateVisible = 1UL << 1,
 };
 typedef NSUInteger NSWindowOcclusionState;
 
 @interface NSWindow (MavericksSDK)
 - (NSWindowOcclusionState)occlusionState;
 @end
 
-// 10.6 SDK don't have CWSecurity while 10.9 SDK don't have CWSecurityMode, to
-// build with SDKs from 10.6 to 10.9 both need to be forward declared and use
-// runtime checks to ensure correct methods are used on different OS X versions.
-enum {
-   kCWSecurityNone = 0,
-   kCWSecurityWEP = 1,
-   kCWSecurityWPAPersonal = 2,
-   kCWSecurityWPAPersonalMixed = 3,
-   kCWSecurityWPA2Personal = 4,
-   kCWSecurityPersonal = 5,
-   kCWSecurityDynamicWEP = 6,
-   kCWSecurityWPAEnterprise = 7,
-   kCWSecurityWPAEnterpriseMixed = 8,
-   kCWSecurityWPA2Enterprise = 9,
-   kCWSecurityEnterprise = 10,
-   kCWSecurityUnknown = NSIntegerMax,
-};
-
-typedef NSInteger CWSecurity;
-
-@interface CWNetwork (MavericksSDK)
-@property(readonly) NSInteger rssiValue;
-- (BOOL)supportsSecurity:(CWSecurity)security;
-@end
-
 #else  // !MAC_OS_X_VERSION_10_9
 
 typedef enum {
    kCWSecurityModeOpen = 0,
    kCWSecurityModeWEP,
    kCWSecurityModeWPA_PSK,
    kCWSecurityModeWPA2_PSK,
    kCWSecurityModeWPA_Enterprise,
    kCWSecurityModeWPA2_Enterprise,
    kCWSecurityModeWPS,
@@ skipping 17 matching lines @@
 @property (readonly, copy) NSString* activityType;
 @property (copy) NSURL* webPageURL;
 
 @end
 
 BASE_EXPORT extern "C" NSString* const NSUserActivityTypeBrowsingWeb;
 
 #endif  // MAC_OS_X_VERSION_10_10
 
 #endif  // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_