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

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

Issue 1019033002: Add an ONC property for the third-party VPN provider extension ID (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed browser tests. Created 5 years, 9 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_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_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index a4219094a4cf565058a5ea9a26c1c3e371647b94..ad05682c962a840bb3f43658901c824b49f3b0a1 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -151,6 +151,11 @@ const OncFieldSignature openvpn_fields[] = {
{ ::onc::openvpn::kVerifyX509, &kVerifyX509Signature},
{NULL}};
+const OncFieldSignature third_party_vpn_fields[] = {
+ { ::onc::kRecommended, &kRecommendedSignature},
+ { ::onc::third_party_vpn::kExtensionID, &kStringSignature},
+ {NULL}};
+
const OncFieldSignature verify_x509_fields[] = {
{ ::onc::verify_x509::kName, &kStringSignature},
{ ::onc::verify_x509::kType, &kStringSignature},
@@ -163,6 +168,7 @@ const OncFieldSignature vpn_fields[] = {
{ ::onc::vpn::kIPsec, &kIPsecSignature},
{ ::onc::vpn::kL2TP, &kL2TPSignature},
{ ::onc::vpn::kOpenVPN, &kOpenVPNSignature},
+ { ::onc::vpn::kThirdPartyVpn, &kThirdPartyVPNSignature},
{ ::onc::vpn::kType, &kStringSignature},
{NULL}};
@@ -385,6 +391,9 @@ const OncValueSignature kL2TPSignature = {
const OncValueSignature kOpenVPNSignature = {
base::Value::TYPE_DICTIONARY, openvpn_fields, NULL
};
+const OncValueSignature kThirdPartyVPNSignature = {
+ base::Value::TYPE_DICTIONARY, third_party_vpn_fields, NULL
+};
const OncValueSignature kVerifyX509Signature = {
base::Value::TYPE_DICTIONARY, verify_x509_fields, NULL
};
« no previous file with comments | « chromeos/network/onc/onc_signature.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