| Index: chromeos/network/onc/onc_signature.cc
|
| diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
|
| index 2bd48eaee1335e825c4f5b033b0c93b662a4d8cc..44bc1b5f77e555c70f23cf6b9eaf2cd5a3b92838 100644
|
| --- a/chromeos/network/onc/onc_signature.cc
|
| +++ b/chromeos/network/onc/onc_signature.cc
|
| @@ -177,7 +177,7 @@ const OncFieldSignature ipconfig_fields[] = {
|
| { ::onc::ipconfig::kIPAddress, &kStringSignature},
|
| { ::onc::ipconfig::kNameServers, &kStringListSignature},
|
| { ::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
|
| - { ::onc::network_config::kSearchDomains, &kStringListSignature},
|
| + { ::onc::ipconfig::kSearchDomains, &kStringListSignature},
|
| { ::onc::ipconfig::kType, &kStringSignature},
|
| { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
|
| {NULL}};
|
| @@ -301,20 +301,11 @@ const OncFieldSignature network_configuration_fields[] = {
|
| { ::onc::network_config::kCellular, &kCellularSignature},
|
| { ::onc::network_config::kEthernet, &kEthernetSignature},
|
| { ::onc::network_config::kGUID, &kStringSignature},
|
| -
|
| { ::onc::network_config::kName, &kStringSignature},
|
| -
|
| - // Not supported, yet.
|
| - { ::onc::network_config::kNameServers, &kStringListSignature},
|
| -
|
| { ::onc::network_config::kPriority, &kIntegerSignature},
|
| { ::onc::network_config::kProxySettings, &kProxySettingsSignature},
|
| { ::onc::kRecommended, &kRecommendedSignature},
|
| { ::onc::kRemove, &kBoolSignature},
|
| -
|
| - // Not supported, yet.
|
| - { ::onc::network_config::kSearchDomains, &kStringListSignature},
|
| -
|
| { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature},
|
| { ::onc::network_config::kType, &kStringSignature},
|
| { ::onc::network_config::kVPN, &kVPNSignature},
|
|
|