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

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

Issue 762243002: Change to Shill's IPConfig objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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_onc_to_shill.cc
diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
index 5300a9d424b5e003ceb66a2c5c9b62c3922b06d1..8e30af55446f6889b6c35922c488bf602039aae8 100644
--- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
+++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
@@ -28,17 +28,6 @@ namespace onc {
namespace {
-bool ConvertListValueToStringVector(const base::ListValue& string_list,
- std::vector<std::string>* result) {
- for (size_t i = 0; i < string_list.GetSize(); ++i) {
- std::string str;
- if (!string_list.GetString(i, &str))
- return false;
- result->push_back(str);
- }
- return true;
-}
-
scoped_ptr<base::StringValue> ConvertValueToString(const base::Value& value) {
std::string str;
if (!value.GetAsString(&str))
@@ -71,7 +60,6 @@ class LocalTranslator {
void TranslateVPN();
void TranslateWiFi();
void TranslateEAP();
- void TranslateStaticIPConfig();
void TranslateNetworkConfiguration();
// Copies all entries from |onc_object_| to |shill_dictionary_| for which a
@@ -108,8 +96,6 @@ class LocalTranslator {
void LocalTranslator::TranslateFields() {
if (onc_signature_ == &kNetworkConfigurationSignature)
TranslateNetworkConfiguration();
- else if (onc_signature_ == &kStaticIPConfigSignature)
- TranslateStaticIPConfig();
else if (onc_signature_ == &kEthernetSignature)
TranslateEthernet();
else if (onc_signature_ == &kVPNSignature)
@@ -141,20 +127,6 @@ void LocalTranslator::TranslateEthernet() {
}
-void LocalTranslator::TranslateStaticIPConfig() {
- const base::ListValue* onc_nameservers = NULL;
- if (onc_object_->GetListWithoutPathExpansion(::onc::ipconfig::kNameServers,
- &onc_nameservers)) {
- std::vector<std::string> onc_nameservers_vector;
- ConvertListValueToStringVector(*onc_nameservers, &onc_nameservers_vector);
- std::string shill_nameservers = JoinString(onc_nameservers_vector, ',');
- shill_dictionary_->SetStringWithoutPathExpansion(
- shill::kStaticIPNameServersProperty, shill_nameservers);
- }
-
- CopyFieldsAccordingToSignature();
-}
-
void LocalTranslator::TranslateOpenVPN() {
// SaveCredentials needs special handling when translating from Shill -> ONC
// so handle it explicitly here.

Powered by Google App Engine
This is Rietveld 408576698