diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 17:23:09 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 17:23:09 +0000 |
| commit | fad51d5af34480a97394401b439fb294bd4c8334 (patch) | |
| tree | 6dcb5d64c1aa99145392053e93bd258f4c7c3c09 /components | |
| parent | dc27479a3baa88f58121bfe8bd5ac106074ed15b (diff) | |
| download | chromium_src-fad51d5af34480a97394401b439fb294bd4c8334.zip chromium_src-fad51d5af34480a97394401b439fb294bd4c8334.tar.gz chromium_src-fad51d5af34480a97394401b439fb294bd4c8334.tar.bz2 | |
Add MacAddress to ONC and networkingPrivate
BUG=373965
For fake_wifi_service.cc
R=armansito@chromium.org, pneubeck@chromium.org
TBR=mef@chromium.org
Review URL: https://codereview.chromium.org/285233008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/onc/docs/onc_spec.html | 10 | ||||
| -rw-r--r-- | components/onc/onc_constants.cc | 1 | ||||
| -rw-r--r-- | components/onc/onc_constants.h | 1 | ||||
| -rw-r--r-- | components/wifi/fake_wifi_service.cc | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html index da0d2cf..f080ba4 100644 --- a/components/onc/docs/onc_spec.html +++ b/components/onc/docs/onc_spec.html @@ -390,6 +390,16 @@ in an error state. </dd> + <dt class="field">MacAddress</dt> + <dd> + <span class="field_meta"> + (optional, read-only) + <span class="type">string</span> + </span> + The MAC address for the network. Only applies to connected non-virtual + networks. The format is 00:11:22:AA:BB:CC. + </dd> + </dl> <section> diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index 01ada2c..c7eb1f1 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -37,6 +37,7 @@ const char kCellular[] = "Cellular"; const char kEthernet[] = "Ethernet"; const char kGUID[] = "GUID"; const char kIPConfigs[] = "IPConfigs"; +const char kMacAddress[] = "MacAddress"; const char kName[] = "Name"; const char kNameServers[] = "NameServers"; const char kProxySettings[] = "ProxySettings"; diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index d38521e..d6ddc1f 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -61,6 +61,7 @@ ONC_EXPORT extern const char kCellular[]; ONC_EXPORT extern const char kEthernet[]; ONC_EXPORT extern const char kGUID[]; 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 kProxySettings[]; diff --git a/components/wifi/fake_wifi_service.cc b/components/wifi/fake_wifi_service.cc index 87b01a4..30953af 100644 --- a/components/wifi/fake_wifi_service.cc +++ b/components/wifi/fake_wifi_service.cc @@ -25,6 +25,7 @@ FakeWiFiService::FakeWiFiService() { network_properties.signal_strength = 40; network_properties.json_extra = "{" + " \"MacAddress\": \"00:11:22:AA:BB:CC\"," " \"IPConfigs\": [{" " \"Gateway\": \"0.0.0.1\"," " \"IPAddress\": \"0.0.0.0\"," |