Index: chromeos/network/onc/onc_constants.h |
diff --git a/chromeos/network/onc/onc_constants.h b/chromeos/network/onc/onc_constants.h |
index 579049ca9099e5cb5cf1c8f1c6f9af136e9c579f..ae865155bd3a2a0eb67f86613c2c6b8f7bec434e 100644 |
--- a/chromeos/network/onc/onc_constants.h |
+++ b/chromeos/network/onc/onc_constants.h |
@@ -34,7 +34,7 @@ CHROMEOS_EXPORT extern const char kRecommended[]; |
CHROMEOS_EXPORT extern const char kRemove[]; |
// NetworkConfiguration. |
-// TODO(pneubeck): Put into namespace. |
+namespace network_config { |
CHROMEOS_EXPORT extern const char kCellular[]; |
CHROMEOS_EXPORT extern const char kEthernet[]; |
CHROMEOS_EXPORT extern const char kGUID[]; |
pneubeck (no reviews)
2013/01/18 10:27:41
should really be identical for both certificates a
Greg Spencer (Chromium)
2013/01/18 22:27:44
Added certificate::kGUID
|
@@ -43,9 +43,60 @@ CHROMEOS_EXPORT extern const char kName[]; |
CHROMEOS_EXPORT extern const char kNameServers[]; |
CHROMEOS_EXPORT extern const char kProxySettings[]; |
CHROMEOS_EXPORT extern const char kSearchDomains[]; |
+CHROMEOS_EXPORT extern const char kServicePath[]; |
+CHROMEOS_EXPORT extern const char kState[]; |
CHROMEOS_EXPORT extern const char kType[]; |
CHROMEOS_EXPORT extern const char kVPN[]; |
CHROMEOS_EXPORT extern const char kWiFi[]; |
+} // namespace network_config |
+ |
+namespace network_type { |
pneubeck (no reviews)
2013/01/18 10:27:41
We didn't differentiate type values from field nam
Greg Spencer (Chromium)
2013/01/18 22:27:44
Well, but the network_type namespace nicely groups
|
+CHROMEOS_EXPORT extern const char kAllTypes[]; |
+CHROMEOS_EXPORT extern const char kCellular[]; |
+CHROMEOS_EXPORT extern const char kEthernet[]; |
+CHROMEOS_EXPORT extern const char kVPN[]; |
+CHROMEOS_EXPORT extern const char kWiFi[]; |
+} // namespace network_type |
+ |
+namespace cellular { |
+CHROMEOS_EXPORT extern const char kActivateOverNonCellularNetwork[]; |
+CHROMEOS_EXPORT extern const char kActivationState[]; |
+CHROMEOS_EXPORT extern const char kAllowRoaming[]; |
+CHROMEOS_EXPORT extern const char kAPN[]; |
+CHROMEOS_EXPORT extern const char kCarrier[]; |
+CHROMEOS_EXPORT extern const char kESN[]; |
+CHROMEOS_EXPORT extern const char kFamily[]; |
+CHROMEOS_EXPORT extern const char kFirmwareRevision[]; |
+CHROMEOS_EXPORT extern const char kFoundNetworks[]; |
+CHROMEOS_EXPORT extern const char kHardwareRevision[]; |
+CHROMEOS_EXPORT extern const char kHomeProvider[]; |
+CHROMEOS_EXPORT extern const char kICCID[]; |
+CHROMEOS_EXPORT extern const char kIMEI[]; |
+CHROMEOS_EXPORT extern const char kIMSI[]; |
+CHROMEOS_EXPORT extern const char kManufacturer[]; |
+CHROMEOS_EXPORT extern const char kMDN[]; |
+CHROMEOS_EXPORT extern const char kMEID[]; |
+CHROMEOS_EXPORT extern const char kMIN[]; |
+CHROMEOS_EXPORT extern const char kModelID[]; |
+CHROMEOS_EXPORT extern const char kNetworkTechnology[]; |
+CHROMEOS_EXPORT extern const char kOperatorCode[]; |
+CHROMEOS_EXPORT extern const char kOperatorName[]; |
+CHROMEOS_EXPORT extern const char kPRLVersion[]; |
+CHROMEOS_EXPORT extern const char kProviderRequiresRoaming[]; |
+CHROMEOS_EXPORT extern const char kRoamingState[]; |
+CHROMEOS_EXPORT extern const char kSelectedNetwork[]; |
+CHROMEOS_EXPORT extern const char kServingOperator[]; |
+CHROMEOS_EXPORT extern const char kSIMLockStatus[]; |
+CHROMEOS_EXPORT extern const char kSIMPresent[]; |
+CHROMEOS_EXPORT extern const char kSupportedCarriers[]; |
+CHROMEOS_EXPORT extern const char kSupportNetworkScan[]; |
+} // namespace cellular |
+ |
+namespace status { |
+CHROMEOS_EXPORT extern const char kConnected[]; |
+CHROMEOS_EXPORT extern const char kConnecting[]; |
+CHROMEOS_EXPORT extern const char kNotConnected[]; |
+} // namespace status |
namespace ipconfig { |
CHROMEOS_EXPORT extern const char kGateway[]; |
@@ -65,6 +116,7 @@ CHROMEOS_EXPORT extern const char k8021X[]; |
namespace wifi { |
CHROMEOS_EXPORT extern const char kAutoConnect[]; |
+CHROMEOS_EXPORT extern const char kBSSID[]; |
CHROMEOS_EXPORT extern const char kEAP[]; |
CHROMEOS_EXPORT extern const char kHiddenSSID[]; |
CHROMEOS_EXPORT extern const char kNone[]; |