diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 17:40:07 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 17:40:07 +0000 |
| commit | 2ea2cc57c97ea91b0db6e4a4411a354262a959a7 (patch) | |
| tree | daf4507637ed7379c3218dd0c7ac6d988cfc53df /chromeos | |
| parent | 75f94f279954227244aad06b34630d4e8ea854ef (diff) | |
| download | chromium_src-2ea2cc57c97ea91b0db6e4a4411a354262a959a7.zip chromium_src-2ea2cc57c97ea91b0db6e4a4411a354262a959a7.tar.gz chromium_src-2ea2cc57c97ea91b0db6e4a4411a354262a959a7.tar.bz2 | |
Adding AutoConnect UI and policy for VPN.
- Extending the ONC spec and implementation.
- Extending the VPN settings page.
BUG=chromium-os:37227
Review URL: https://chromiumcodereview.appspot.com/12052007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/docs/onc_spec.html | 12 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_constants.cc | 1 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_constants.h | 1 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_signature.cc | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/chromeos/docs/onc_spec.html b/chromeos/docs/onc_spec.html index f715bae..5220b17 100644 --- a/chromeos/docs/onc_spec.html +++ b/chromeos/docs/onc_spec.html @@ -476,7 +476,8 @@ (optional, defaults to <span class="value">false</span>) <span class="type">boolean</span> </span> - Indicating network should be connected when in range. + Indicating that the network should be connected to automatically when in + range. </dd> <dt class="field">EAP</dt> @@ -552,6 +553,15 @@ </p> <dl class="field_list"> + <dt class="field">AutoConnect</dt> + <dd> + <span class="field_meta"> + (optional, defaults to <span class="value">false</span>) + <span class="type">boolean</span> + </span> + Indicating that the network should be connected to automatically. + </dd> + <dt class="field">Host</dt> <dd> <span class="field_meta"> diff --git a/chromeos/network/onc/onc_constants.cc b/chromeos/network/onc/onc_constants.cc index b8e8d87..9b199bf 100644 --- a/chromeos/network/onc/onc_constants.cc +++ b/chromeos/network/onc/onc_constants.cc @@ -188,6 +188,7 @@ const char kAuthNoCache[] = "AuthNoCache"; const char kAuthRetry[] = "AuthRetry"; const char kAuth[] = "Auth"; const char kAuthenticationType[] = "AuthenticationType"; +const char kAutoConnect[] = "AutoConnect"; const char kCert[] = "Cert"; const char kCipher[] = "Cipher"; const char kClientCertPattern[] = "ClientCertPattern"; diff --git a/chromeos/network/onc/onc_constants.h b/chromeos/network/onc/onc_constants.h index 29b686a..dae7131 100644 --- a/chromeos/network/onc/onc_constants.h +++ b/chromeos/network/onc/onc_constants.h @@ -201,6 +201,7 @@ CHROMEOS_EXPORT extern const char kAuthNoCache[]; CHROMEOS_EXPORT extern const char kAuthRetry[]; CHROMEOS_EXPORT extern const char kAuth[]; CHROMEOS_EXPORT extern const char kAuthenticationType[]; +CHROMEOS_EXPORT extern const char kAutoConnect[]; CHROMEOS_EXPORT extern const char kCert[]; CHROMEOS_EXPORT extern const char kCipher[]; CHROMEOS_EXPORT extern const char kClientCertPattern[]; diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc index a8766aa..942fbda 100644 --- a/chromeos/network/onc/onc_signature.cc +++ b/chromeos/network/onc/onc_signature.cc @@ -148,6 +148,7 @@ const OncFieldSignature openvpn_fields[] = { const OncFieldSignature vpn_fields[] = { { kRecommended, NULL, &kRecommendedSignature }, + { vpn::kAutoConnect, flimflam::kAutoConnectProperty, &kBoolSignature }, { vpn::kHost, flimflam::kProviderHostProperty, &kStringSignature }, { vpn::kIPsec, NULL, &kIPsecSignature }, { vpn::kL2TP, NULL, &kL2TPSignature }, |