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

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

Issue 509643003: Use GetManagedProperties in InternetOptionsHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_8a
Patch Set: Created 6 years, 4 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_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index a8139456158bcd51987dd6c5f5c6d73a6b8d8dee..5a2c965bdf21be31b9729528f423fa52c5226c36 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -178,6 +178,7 @@ const OncFieldSignature ipconfig_fields[] = {
{ ::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
{ ::onc::network_config::kSearchDomains, &kStringListSignature},
{ ::onc::ipconfig::kType, &kStringSignature},
+ { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
{NULL}};
const OncFieldSignature proxy_location_fields[] = {
@@ -287,8 +288,13 @@ const OncFieldSignature network_configuration_fields[] = {
{ ::onc::kRecommended, &kRecommendedSignature},
{ ::onc::network_config::kEthernet, &kEthernetSignature},
{ ::onc::network_config::kGUID, &kStringSignature},
- // Not supported for policy but for reading network state.
+
+ // IPConfig fields are not supported for policy (onc -> shill) but are
+ // supported for reading network state (shill -> onc).
{ ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
+ { ::onc::network_config::kSavedIPConfig, &kIPConfigSignature},
+ { ::onc::network_config::kStaticIPConfig, &kIPConfigSignature},
+
{ ::onc::network_config::kName, &kStringSignature},
// Not supported, yet.
{ ::onc::network_config::kNameServers, &kStringListSignature},

Powered by Google App Engine
This is Rietveld 408576698