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

Unified Diff: components/wifi/wifi_service_win.cc

Issue 368233004: ONC: Cleanup client certificate related fields. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compilation on Win/Mac. Created 6 years, 5 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 | « components/wifi/wifi_service_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/wifi/wifi_service_win.cc
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index 523013e88ca0da6a1a122be8ecf86fa9dc75c8a5..a4a99d440ae7c7473f4b41c7379f937568a5a15e 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -1256,7 +1256,7 @@ std::string WiFiServiceImpl::SecurityFromDot11AuthAlg(
case DOT11_AUTH_ALGO_80211_SHARED_KEY:
return onc::wifi::kWEP_PSK;
case DOT11_AUTH_ALGO_80211_OPEN:
- return onc::wifi::kNone;
+ return onc::wifi::kSecurityNone;
default:
return onc::wifi::kWPA_EAP;
}
@@ -1600,7 +1600,7 @@ DWORD WiFiServiceImpl::Connect(const std::string& network_guid,
if (error_string.empty() &&
properties->GetDictionary(onc::network_type::kWiFi, &wifi) &&
wifi->GetString(onc::wifi::kSecurity, &wifi_security) &&
- wifi_security != onc::wifi::kNone) {
+ wifi_security != onc::wifi::kSecurityNone) {
error = ERROR_ACCESS_DENIED;
LOG(ERROR) << error;
return error;
@@ -1743,7 +1743,7 @@ bool WiFiServiceImpl::AuthEncryptionFromSecurity(
std::string* authentication,
std::string* encryption,
std::string* key_type) const {
- if (security == onc::wifi::kNone) {
+ if (security == onc::wifi::kSecurityNone) {
*authentication = kAuthenticationOpen;
*encryption = kEncryptionNone;
} else if (security == onc::wifi::kWEP_PSK) {
« no previous file with comments | « components/wifi/wifi_service_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698