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

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

Issue 571123002: Fix some properties on the settings page read from ONC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODO. 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
« no previous file with comments | « chromeos/network/onc/onc_translation_tables.cc ('k') | chromeos/test/data/network/cellular.onc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..1474d0486be4643bf22644bca31c14965107f77e 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -393,7 +393,10 @@ void ShillToONCTranslator::TranslateNetworkWithState() {
if (!onc_network_type.empty()) {
onc_object_->SetStringWithoutPathExpansion(::onc::network_config::kType,
onc_network_type);
- TranslateAndAddNestedObject(onc_network_type);
+ // Wimax is not supported by ONC, yet.
+ // TOOD(pneubeck): Wimax support is required, see https://crbug.com/414417 .
+ if (onc_network_type != ::onc::network_type::kWimax)
+ TranslateAndAddNestedObject(onc_network_type);
}
// Since Name is a read only field in Shill unless it's a VPN, it is copied
« no previous file with comments | « chromeos/network/onc/onc_translation_tables.cc ('k') | chromeos/test/data/network/cellular.onc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698