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

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

Issue 23526016: Autoconnect policy for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed policy. Created 7 years, 2 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
« no previous file with comments | « chromeos/network/onc/onc_signature.h ('k') | chromeos/network/onc/onc_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4996ae2b42a0121300b1ed871d4dd0580ffa61d0 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -263,6 +263,11 @@ const OncFieldSignature network_with_state_fields[] = {
{ ::onc::network_config::kWiFi, &kWiFiWithStateSignature},
{NULL}};
+const OncFieldSignature global_network_configuration_fields[] = {
+ { ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
+ &kBoolSignature},
+ {NULL}};
+
const OncFieldSignature certificate_fields[] = {
{ ::onc::certificate::kGUID, &kStringSignature},
{ ::onc::certificate::kPKCS12, &kStringSignature},
@@ -276,6 +281,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 +343,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
};
« no previous file with comments | « chromeos/network/onc/onc_signature.h ('k') | chromeos/network/onc/onc_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698