diff options
author | pneubeck <pneubeck@chromium.org> | 2014-09-18 08:31:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 15:31:53 +0000 |
commit | a901ffa9729db84945b44831ce2aacf48dea5bec (patch) | |
tree | c2f772baa27315aec34883a1ee80e4ba5cc260de /components/onc | |
parent | ffe70eca0f81753c11052b9229128f72d49c45ea (diff) | |
download | chromium_src-a901ffa9729db84945b44831ce2aacf48dea5bec.zip chromium_src-a901ffa9729db84945b44831ce2aacf48dea5bec.tar.gz chromium_src-a901ffa9729db84945b44831ce2aacf48dea5bec.tar.bz2 |
Add Wimax to ONC.
This adds the object "WiMAX" to ONC, which contains the basic properties
AutoConnect (read/write)
EAP (write-only)
SignalStrength (read-only).
Also all general network properties like Name or ConnectionState are supported.
BUG=414417
Review URL: https://codereview.chromium.org/578823003
Cr-Commit-Position: refs/heads/master@{#295467}
Diffstat (limited to 'components/onc')
-rw-r--r-- | components/onc/onc_constants.cc | 10 | ||||
-rw-r--r-- | components/onc/onc_constants.h | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index 1570681..c4ea339 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -58,6 +58,7 @@ const char kStaticIPConfig[] = "StaticIPConfig"; const char kType[] = "Type"; const char kVPN[] = "VPN"; const char kWiFi[] = "WiFi"; +const char kWimax[] = "WiMAX"; std::string CellularProperty(const std::string& property) { return std::string(kCellular) + "." + property; @@ -79,7 +80,7 @@ const char kCellular[] = "Cellular"; const char kEthernet[] = "Ethernet"; const char kVPN[] = "VPN"; const char kWiFi[] = "WiFi"; -const char kWimax[] = "Wimax"; +const char kWimax[] = "WiMAX"; const char kWireless[] = "Wireless"; } // namespace network_type @@ -183,7 +184,6 @@ const char kFrequency[] = "Frequency"; const char kFrequencyList[] = "FrequencyList"; const char kHiddenSSID[] = "HiddenSSID"; const char kPassphrase[] = "Passphrase"; -const char kProxyURL[] = "ProxyURL"; const char kSSID[] = "SSID"; const char kSecurity[] = "Security"; const char kSecurityNone[] = "None"; @@ -195,6 +195,12 @@ const char kWPA_PSK[] = "WPA-PSK"; const char kWPA2_PSK[] = "WPA2-PSK"; } // namespace wifi +namespace wimax { +const char kAutoConnect[] = "AutoConnect"; +const char kEAP[] = "EAP"; +const char kSignalStrength[] = "SignalStrength"; +} // namespace wimax + namespace client_cert { const char kClientCertPattern[] = "ClientCertPattern"; const char kClientCertRef[] = "ClientCertRef"; diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index ce0bc8f..976946b 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -83,6 +83,7 @@ ONC_EXPORT extern const char kErrorState[]; ONC_EXPORT extern const char kType[]; ONC_EXPORT extern const char kVPN[]; ONC_EXPORT extern const char kWiFi[]; +ONC_EXPORT extern const char kWimax[]; ONC_EXPORT extern std::string CellularProperty(const std::string& property); ONC_EXPORT extern std::string VpnProperty(const std::string& property); @@ -201,7 +202,6 @@ ONC_EXPORT extern const char kFrequency[]; ONC_EXPORT extern const char kFrequencyList[]; ONC_EXPORT extern const char kHiddenSSID[]; ONC_EXPORT extern const char kPassphrase[]; -ONC_EXPORT extern const char kProxyURL[]; ONC_EXPORT extern const char kSSID[]; ONC_EXPORT extern const char kSecurity[]; ONC_EXPORT extern const char kSecurityNone[]; @@ -213,6 +213,12 @@ ONC_EXPORT extern const char kWPA2_PSK[]; ONC_EXPORT extern const char kWPA_EAP[]; } // namespace wifi +namespace wimax { +ONC_EXPORT extern const char kAutoConnect[]; +ONC_EXPORT extern const char kEAP[]; +ONC_EXPORT extern const char kSignalStrength[]; +} // namespace wimax + namespace client_cert { ONC_EXPORT extern const char kClientCertPattern[]; ONC_EXPORT extern const char kClientCertRef[]; |