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

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

Issue 581213003: Translate Wimax from Shill -> ONC, fix JS Wimax strings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index d7bc265e0ceeb9de0d75f9f703239e96c2a6a3e9..43bb42fa6f0677ef29c58cebcb4ba311ad0daa61 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -79,6 +79,7 @@ class ShillToONCTranslator {
void TranslateIPsec();
void TranslateVPN();
void TranslateWiFiWithState();
+ void TranslateWiMAXWithState();
void TranslateCellularWithState();
void TranslateCellularDevice();
void TranslateNetworkWithState();
@@ -160,6 +161,8 @@ ShillToONCTranslator::CreateTranslatedONCObject() {
TranslateIPsec();
} else if (onc_signature_ == &kWiFiWithStateSignature) {
TranslateWiFiWithState();
+ } else if (onc_signature_ == &kWiMAXWithStateSignature) {
+ TranslateWiMAXWithState();
} else if (onc_signature_ == &kCellularWithStateSignature) {
if (field_translation_table_ == kCellularDeviceTable)
TranslateCellularDevice();
@@ -317,6 +320,12 @@ void ShillToONCTranslator::TranslateWiFiWithState() {
if (!ssid.empty())
onc_object_->SetStringWithoutPathExpansion(::onc::wifi::kSSID, ssid);
CopyPropertiesAccordingToSignature();
+ TranslateAndAddNestedObject(::onc::wifi::kEAP);
+}
+
+void ShillToONCTranslator::TranslateWiMAXWithState() {
+ CopyPropertiesAccordingToSignature();
+ TranslateAndAddNestedObject(::onc::wimax::kEAP);
}
void ShillToONCTranslator::TranslateCellularWithState() {

Powered by Google App Engine
This is Rietveld 408576698