diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-09-16 18:10:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 01:11:41 +0000 |
| commit | 845fe5282698356aaf9f4db88c1e339b4be76c5d (patch) | |
| tree | 62f28da61bc3dce7b03d3b7283922aafdc6f98a0 /components/onc | |
| parent | 20e5942015f490bbeca91314d8e41116c3271c89 (diff) | |
| download | chromium_src-845fe5282698356aaf9f4db88c1e339b4be76c5d.zip chromium_src-845fe5282698356aaf9f4db88c1e339b4be76c5d.tar.gz chromium_src-845fe5282698356aaf9f4db88c1e339b4be76c5d.tar.bz2 | |
Add Provider Name to ONC ThirdPartyVPN dictionary
This CL:
* Populates ThirdPartyVPN.Name property for all
networkingPrivate get* methods, including getState and
getNetworks so that the VPN network names can be displayed
correctly.
* Updates the existing and new Settings UI to use this
property.
BUG=516796
Review URL: https://codereview.chromium.org/1295583003
Cr-Commit-Position: refs/heads/master@{#349305}
Diffstat (limited to 'components/onc')
| -rw-r--r-- | components/onc/docs/onc_spec.html | 8 | ||||
| -rw-r--r-- | components/onc/onc_constants.cc | 1 | ||||
| -rw-r--r-- | components/onc/onc_constants.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html index 56caf14..f5f342e 100644 --- a/components/onc/docs/onc_spec.html +++ b/components/onc/docs/onc_spec.html @@ -1635,6 +1635,14 @@ </span> The extension ID of the third-party VPN provider used by this network. </dd> + <dt class="field">ProviderName</dt> + <dd> + <span class="field_meta"> + (optional, read-only) + <span class="type">string</span> + </span> + The name of the third-party VPN provider used by this network. + </dd> </dl> </section> diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index 11f33f1..268122a 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -379,6 +379,7 @@ const char kPasswordAndOTP[] = "PasswordAndOTP"; namespace third_party_vpn { const char kExtensionID[] = "ExtensionID"; +const char kProviderName[] = "ProviderName"; } // third_party_vpn namespace verify_x509 { diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index bb25906..d4e98a5 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -397,6 +397,7 @@ ONC_EXPORT extern const char kPasswordAndOTP[]; namespace third_party_vpn { ONC_EXPORT extern const char kExtensionID[]; +ONC_EXPORT extern const char kProviderName[]; } // third_party_vpn namespace verify_x509 { |