diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 16:05:46 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-21 16:07:35 +0000 |
commit | ba37c3405e4e33be4fb578871b706837a02b9f28 (patch) | |
tree | 7643a8cb1302401384f3c3f174c3a56946789f57 /components | |
parent | 4e5cb4028b3acf74fa5d8f15d0a1c9843e449c22 (diff) | |
download | chromium_src-ba37c3405e4e33be4fb578871b706837a02b9f28.zip chromium_src-ba37c3405e4e33be4fb578871b706837a02b9f28.tar.gz chromium_src-ba37c3405e4e33be4fb578871b706837a02b9f28.tar.bz2 |
Use Managed properties for Preferred and Provider.
This includes some necessary ONC translation fixes.
BUG=279351
R=armansito@chromium.org, pneubeck@chromium.org
Review URL: https://codereview.chromium.org/482243002
Cr-Commit-Position: refs/heads/master@{#291085}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r-- | components/onc/docs/onc_spec.html | 11 | ||||
-rw-r--r-- | components/onc/onc_constants.cc | 1 | ||||
-rw-r--r-- | components/onc/onc_constants.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html index 4b72a3e..6822117 100644 --- a/components/onc/docs/onc_spec.html +++ b/components/onc/docs/onc_spec.html @@ -400,6 +400,17 @@ networks. The format is 00:11:22:AA:BB:CC. </dd> + <dt class="field">Priority</dt> + <dd> + <span class="field_meta"> + (optional) + <span class="type">integer</span> + </span> + Provides a suggested priority value for this network. May be used by the + system to determine which network to connect to when multiple configured + networks are available (or may be ignored). + </dd> + </dl> <section> diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index 1c1dccda..4909aed 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -41,6 +41,7 @@ const char kIPConfigs[] = "IPConfigs"; const char kMacAddress[] = "MacAddress"; const char kName[] = "Name"; const char kNameServers[] = "NameServers"; +const char kPriority[] = "Priority"; const char kProxySettings[] = "ProxySettings"; const char kSearchDomains[] = "SearchDomains"; const char kConnectionState[] = "ConnectionState"; diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index 5db4c92..371570c 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -65,6 +65,7 @@ ONC_EXPORT extern const char kIPConfigs[]; ONC_EXPORT extern const char kMacAddress[]; ONC_EXPORT extern const char kName[]; ONC_EXPORT extern const char kNameServers[]; +ONC_EXPORT extern const char kPriority[]; ONC_EXPORT extern const char kProxySettings[]; ONC_EXPORT extern const char kSearchDomains[]; ONC_EXPORT extern const char kConnectionState[]; |