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

Unified Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 788633003: chromeos networking: move from security to securityclass property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: rebase, resolve conflicts, update new test data (shill_wifi_dhcp.json) Created 5 years, 11 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
Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 3e22de3aa7c4f58b00166d9456e1b124ef44bc42..6d9ade38f15f085993f7355692577ffa654e6240 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -120,7 +120,7 @@ const FieldTranslationEntry wifi_fields[] = {
// This field is converted during translation, see onc_translator_*.
// { ::onc::wifi::kSSID, shill::kWifiHexSsid},
// This field is converted during translation, see onc_translator_*.
- // { ::onc::wifi::kSecurity, shill::kSecurityProperty },
+ // { ::onc::wifi::kSecurity, shill::kSecurityClassProperty },
{ ::onc::wifi::kSignalStrength, shill::kSignalStrengthProperty},
{NULL}};
@@ -285,14 +285,11 @@ const StringTranslationEntry kVPNTypeTable[] = {
{ ::onc::vpn::kThirdPartyVpn, shill::kProviderThirdPartyVpn},
{NULL}};
-// The first matching line is chosen.
const StringTranslationEntry kWiFiSecurityTable[] = {
{ ::onc::wifi::kSecurityNone, shill::kSecurityNone},
{ ::onc::wifi::kWEP_PSK, shill::kSecurityWep},
{ ::onc::wifi::kWPA_PSK, shill::kSecurityPsk},
{ ::onc::wifi::kWPA_EAP, shill::kSecurity8021x},
- { ::onc::wifi::kWPA_PSK, shill::kSecurityRsn},
- { ::onc::wifi::kWPA_PSK, shill::kSecurityWpa},
{NULL}};
const StringTranslationEntry kEAPOuterTable[] = {
« no previous file with comments | « chromeos/network/network_state_handler_unittest.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698