| Index: chromeos/network/onc/onc_signature.cc
|
| diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
|
| index fc7bf2f041fa3aa37f915823b815c30d53884c2f..ea950ecbac05e392f243041773a34f325f135177 100644
|
| --- a/chromeos/network/onc/onc_signature.cc
|
| +++ b/chromeos/network/onc/onc_signature.cc
|
| @@ -263,6 +263,10 @@ const OncFieldSignature network_with_state_fields[] = {
|
| { ::onc::network_config::kWiFi, &kWiFiWithStateSignature},
|
| {NULL}};
|
|
|
| +const OncFieldSignature global_network_configuration_fields[] = {
|
| + { ::onc::global_network_config::kAllowAutoconnect, &kBoolSignature}, {NULL}
|
| +};
|
| +
|
| const OncFieldSignature certificate_fields[] = {
|
| { ::onc::certificate::kGUID, &kStringSignature},
|
| { ::onc::certificate::kPKCS12, &kStringSignature},
|
| @@ -276,6 +280,8 @@ const OncFieldSignature toplevel_configuration_fields[] = {
|
| { ::onc::toplevel_config::kCertificates, &kCertificateListSignature},
|
| { ::onc::toplevel_config::kNetworkConfigurations,
|
| &kNetworkConfigurationListSignature},
|
| + { ::onc::toplevel_config::kGlobalNetworkConfiguration,
|
| + &kGlobalNetworkConfigurationSignature},
|
| { ::onc::toplevel_config::kType, &kStringSignature},
|
| { ::onc::encrypted::kCipher, &kStringSignature},
|
| { ::onc::encrypted::kCiphertext, &kStringSignature},
|
| @@ -336,6 +342,9 @@ const OncValueSignature kCertificateSignature = {
|
| const OncValueSignature kNetworkConfigurationSignature = {
|
| Value::TYPE_DICTIONARY, network_configuration_fields, NULL
|
| };
|
| +const OncValueSignature kGlobalNetworkConfigurationSignature = {
|
| + Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
|
| +};
|
| const OncValueSignature kCertificateListSignature = {
|
| Value::TYPE_LIST, NULL, &kCertificateSignature
|
| };
|
|
|