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

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

Issue 776603002: Revert of Change to Shill's IPConfig objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chromeos/network/onc/onc_translation_tables.h ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f573897177d7053ef75ab6fac85ac8c2453479e6..d02c922150ccf1b404c0f83c9316414fe901acde 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -207,11 +207,20 @@
shill::kWebProxyAutoDiscoveryUrlProperty},
{NULL}};
-const FieldTranslationEntry static_or_saved_ipconfig_fields[] = {
- { ::onc::ipconfig::kIPAddress, shill::kAddressProperty},
- { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
- { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
- { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
+const FieldTranslationEntry saved_ipconfig_fields[] = {
+ { ::onc::ipconfig::kIPAddress, shill::kSavedIPAddressProperty},
+ { ::onc::ipconfig::kGateway, shill::kSavedIPGatewayProperty},
+ { ::onc::ipconfig::kRoutingPrefix, shill::kSavedIPPrefixlenProperty},
+ // NameServers are converted during translation, see onc_translator_*.
+ // { ::onc::ipconfig::kNameServers, shill::kSavedIPNameServersProperty},
+ {NULL}};
+
+const FieldTranslationEntry static_ipconfig_fields[] = {
+ { ::onc::ipconfig::kIPAddress, shill::kStaticIPAddressProperty},
+ { ::onc::ipconfig::kGateway, shill::kStaticIPGatewayProperty},
+ { ::onc::ipconfig::kRoutingPrefix, shill::kStaticIPPrefixlenProperty},
+ // NameServers are converted during translation, see onc_translator_*.
+ // { ::onc::ipconfig::kNameServers, shill::kStaticIPNameServersProperty},
{NULL}};
struct OncValueTranslationEntry {
@@ -240,8 +249,8 @@
{ &kNetworkWithStateSignature, network_fields },
{ &kNetworkConfigurationSignature, network_fields },
{ &kIPConfigSignature, ipconfig_fields },
- { &kSavedIPConfigSignature, static_or_saved_ipconfig_fields },
- { &kStaticIPConfigSignature, static_or_saved_ipconfig_fields },
+ { &kSavedIPConfigSignature, saved_ipconfig_fields },
+ { &kStaticIPConfigSignature, static_ipconfig_fields },
{ NULL }
};
@@ -251,19 +260,13 @@
const char* const* shill_property_path;
};
-const char* cellular_apn_path_entries[] = {
+const char* cellular_apn_property_path_entries[] = {
shill::kCellularApnProperty,
NULL
};
-const char* static_ip_config_path_entries[] = {
- shill::kStaticIPConfigProperty,
- NULL
-};
-
const NestedShillDictionaryEntry nested_shill_dictionaries[] = {
- { &kCellularApnSignature, cellular_apn_path_entries },
- { &kStaticIPConfigSignature, static_ip_config_path_entries },
+ { &kCellularApnSignature, cellular_apn_property_path_entries },
{ NULL }
};
« no previous file with comments | « chromeos/network/onc/onc_translation_tables.h ('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