Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1051)

Unified Diff: components/wifi/wifi_service_mac.mm

Issue 1776253002: Remove references to CWNetwork. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp89_107_remoting
Patch Set: Fix compile error. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | content/browser/geolocation/wifi_data_provider_corewlan_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/wifi/wifi_service_mac.mm
diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm
index 576d09f7bbc16daa1216b35e7c0b5c2dc3951eb9..ea2961c4e774d277ca5c7f00151c3dea2b8ca4f3 100644
--- a/components/wifi/wifi_service_mac.mm
+++ b/components/wifi/wifi_service_mac.mm
@@ -101,9 +101,6 @@ class WiFiServiceMac : public WiFiService {
void NetworkPropertiesFromCWNetwork(const CWNetwork* network,
NetworkProperties* properties) const;
- // Converts |CWSecurityMode| into onc::wifi::k{WPA|WEP}* security constant.
- std::string SecurityFromCWSecurityMode(CWSecurityMode security) const;
-
// Returns onc::wifi::k{WPA|WEP}* security constant supported by the
// |CWNetwork|.
std::string SecurityFromCWNetwork(const CWNetwork* network) const;
@@ -521,46 +518,8 @@ void WiFiServiceMac::NetworkPropertiesFromCWNetwork(
static_cast<CWChannelBand>([[network wlanChannel] channelBand]));
properties->frequency_set.insert(properties->frequency);
- // -[CWNetwork supportsSecurity:] is available from 10.7 SDK while
- // -[CWNetwork securityMode] is deprecated and hidden as private since
- // 10.9 SDK. The latter is kept for now to support running on 10.6. It
- // should be removed when 10.6 support is dropped.
- if ([network respondsToSelector:@selector(supportsSecurity:)]) {
- properties->security = SecurityFromCWNetwork(network);
- } else {
- properties->security = SecurityFromCWSecurityMode(
- static_cast<CWSecurityMode>([[network securityMode] intValue]));
- }
-
- // rssiValue property of CWNetwork is available from 10.7 SDK while
- // -[CWNetwork rssi] is deprecated and hidden as private since 10.9 SDK.
- // The latter is kept for now to support running on 10.6. It should be
- // removed when 10.6 support is dropped.
- if ([network respondsToSelector:@selector(rssiValue)])
- properties->signal_strength = [network rssiValue];
- else
- properties->signal_strength = [[network rssi] intValue];
-}
-
-std::string WiFiServiceMac::SecurityFromCWSecurityMode(
- CWSecurityMode security) const {
- switch (security) {
- case kCWSecurityModeWPA_Enterprise:
- case kCWSecurityModeWPA2_Enterprise:
- return onc::wifi::kWPA_EAP;
- case kCWSecurityModeWPA_PSK:
- case kCWSecurityModeWPA2_PSK:
- return onc::wifi::kWPA_PSK;
- case kCWSecurityModeWEP:
- return onc::wifi::kWEP_PSK;
- case kCWSecurityModeOpen:
- return onc::wifi::kSecurityNone;
- // TODO(mef): Figure out correct mapping.
- case kCWSecurityModeWPS:
- case kCWSecurityModeDynamicWEP:
- return onc::wifi::kWPA_EAP;
- }
- return onc::wifi::kWPA_EAP;
+ properties->security = SecurityFromCWNetwork(network);
+ properties->signal_strength = [network rssiValue];
}
std::string WiFiServiceMac::SecurityFromCWNetwork(
« no previous file with comments | « base/mac/sdk_forward_declarations.h ('k') | content/browser/geolocation/wifi_data_provider_corewlan_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698