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

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

Issue 708563005: Use setProperties for IP Config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430113_internet_options_1
Patch Set: IPConfigType=Static applies to NameServer only config Created 6 years 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 cfce26a3f5ce272033273e9ec667db0804dac24f..100b280754f2a3180fef3c6a2ecced7e8f23ba23 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -486,9 +486,13 @@ void ShillToONCTranslator::TranslateNetworkWithState() {
*saved_ipconfig);
}
+ // Set IPConfigType to 'Static' if a StaticIPConfig object exists.
pneubeck (no reviews) 2014/12/05 09:47:46 ah, forgot that one. You could also set it to DHCP
stevenjb 2015/01/08 00:44:39 Addressed in other CL.
const base::DictionaryValue* static_ipconfig = nullptr;
if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
- shill::kStaticIPConfigProperty, &static_ipconfig)) {
+ shill::kStaticIPConfigProperty, &static_ipconfig)) {
+ onc_object_->SetStringWithoutPathExpansion(
+ ::onc::network_config::kIPConfigType,
+ ::onc::network_config::kIPConfigTypeStatic);
TranslateAndAddNestedObject(::onc::network_config::kStaticIPConfig,
*static_ipconfig);
}

Powered by Google App Engine
This is Rietveld 408576698