Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / onc / onc_constants.h

diff --git a/src/components/onc/onc_constants.h b/src/components/onc/onc_constants.h
index df815c6..5db4c92 100644 (file)
--- a/src/components/onc/onc_constants.h
+++ b/src/components/onc/onc_constants.h
@@ -92,8 +92,8 @@ ONC_EXPORT extern const char kWireless[];
 }  // namespace network_type
 
 namespace cellular {
-ONC_EXPORT extern const char kActivateOverNonCellularNetwork[];
 ONC_EXPORT extern const char kActivationState[];
+ONC_EXPORT extern const char kActivationType[];
 ONC_EXPORT extern const char kAllowRoaming[];
 ONC_EXPORT extern const char kAPN[];
 ONC_EXPORT extern const char kAPNList[];
@@ -118,9 +118,7 @@ ONC_EXPORT extern const char kProviderRequiresRoaming[];
 ONC_EXPORT extern const char kRoamingState[];
 ONC_EXPORT extern const char kSelectedNetwork[];
 ONC_EXPORT extern const char kServingOperator[];
-ONC_EXPORT extern const char kSIMLockEnabled[];
 ONC_EXPORT extern const char kSIMLockStatus[];
-ONC_EXPORT extern const char kSIMLockType[];
 ONC_EXPORT extern const char kSIMPresent[];
 ONC_EXPORT extern const char kSupportedCarriers[];
 ONC_EXPORT extern const char kSupportNetworkScan[];
@@ -136,8 +134,23 @@ namespace cellular_apn {
 ONC_EXPORT extern const char kName[];
 ONC_EXPORT extern const char kUsername[];
 ONC_EXPORT extern const char kPassword[];
+ONC_EXPORT extern const char kLocalizedName[];
+ONC_EXPORT extern const char kLanguage[];
 }  // namespace cellular_apn
 
+namespace cellular_found_network {
+ONC_EXPORT extern const char kStatus[];
+ONC_EXPORT extern const char kNetworkId[];
+ONC_EXPORT extern const char kShortName[];
+ONC_EXPORT extern const char kLongName[];
+ONC_EXPORT extern const char kTechnology[];
+}  // namespace cellular_found_network
+
+namespace sim_lock_status {
+ONC_EXPORT extern const char kLockEnabled[];
+ONC_EXPORT extern const char kLockType[];
+ONC_EXPORT extern const char kRetriesLeft[];
+}  // namespace sim_lock_status
 
 namespace connection_state {
 ONC_EXPORT extern const char kConnected[];
@@ -157,8 +170,8 @@ ONC_EXPORT extern const char kType[];
 
 namespace ethernet {
 ONC_EXPORT extern const char kAuthentication[];
+ONC_EXPORT extern const char kAuthenticationNone[];
 ONC_EXPORT extern const char kEAP[];
-ONC_EXPORT extern const char kNone[];
 ONC_EXPORT extern const char k8021X[];
 }  // namespace ethernet
 
@@ -169,11 +182,11 @@ ONC_EXPORT extern const char kEAP[];
 ONC_EXPORT extern const char kFrequency[];
 ONC_EXPORT extern const char kFrequencyList[];
 ONC_EXPORT extern const char kHiddenSSID[];
-ONC_EXPORT extern const char kNone[];
 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[];
 ONC_EXPORT extern const char kSignalStrength[];
 ONC_EXPORT extern const char kWEP_PSK[];
 ONC_EXPORT extern const char kWEP_8021X[];
@@ -182,25 +195,31 @@ ONC_EXPORT extern const char kWPA2_PSK[];
 ONC_EXPORT extern const char kWPA_EAP[];
 }  // namespace wifi
 
-namespace certificate {
-ONC_EXPORT extern const char kAuthority[];
-ONC_EXPORT extern const char kClient[];
+namespace client_cert {
+ONC_EXPORT extern const char kClientCertPattern[];
+ONC_EXPORT extern const char kClientCertRef[];
+ONC_EXPORT extern const char kClientCertType[];
+ONC_EXPORT extern const char kClientCertTypeNone[];
 ONC_EXPORT extern const char kCommonName[];
 ONC_EXPORT extern const char kEmailAddress[];
 ONC_EXPORT extern const char kEnrollmentURI[];
-ONC_EXPORT extern const char kGUID[];
 ONC_EXPORT extern const char kIssuerCARef[];
 ONC_EXPORT extern const char kIssuerCAPEMs[];
 ONC_EXPORT extern const char kIssuer[];
 ONC_EXPORT extern const char kLocality[];
-ONC_EXPORT extern const char kNone[];
 ONC_EXPORT extern const char kOrganization[];
 ONC_EXPORT extern const char kOrganizationalUnit[];
-ONC_EXPORT extern const char kPKCS12[];
 ONC_EXPORT extern const char kPattern[];
 ONC_EXPORT extern const char kRef[];
-ONC_EXPORT extern const char kServer[];
 ONC_EXPORT extern const char kSubject[];
+}  // namespace client_cert
+
+namespace certificate {
+ONC_EXPORT extern const char kAuthority[];
+ONC_EXPORT extern const char kClient[];
+ONC_EXPORT extern const char kGUID[];
+ONC_EXPORT extern const char kPKCS12[];
+ONC_EXPORT extern const char kServer[];
 ONC_EXPORT extern const char kTrustBits[];
 ONC_EXPORT extern const char kType[];
 ONC_EXPORT extern const char kWeb[];
@@ -224,9 +243,6 @@ ONC_EXPORT extern const char kStretch[];
 namespace eap {
 ONC_EXPORT extern const char kAnonymousIdentity[];
 ONC_EXPORT extern const char kAutomatic[];
-ONC_EXPORT extern const char kClientCertPattern[];
-ONC_EXPORT extern const char kClientCertRef[];
-ONC_EXPORT extern const char kClientCertType[];
 ONC_EXPORT extern const char kEAP_AKA[];
 ONC_EXPORT extern const char kEAP_FAST[];
 ONC_EXPORT extern const char kEAP_SIM[];
@@ -250,9 +266,6 @@ ONC_EXPORT extern const char kUseSystemCAs[];
 
 namespace vpn {
 ONC_EXPORT extern const char kAutoConnect[];
-ONC_EXPORT extern const char kClientCertPattern[];
-ONC_EXPORT extern const char kClientCertRef[];
-ONC_EXPORT extern const char kClientCertType[];
 ONC_EXPORT extern const char kHost[];
 ONC_EXPORT extern const char kIPsec[];
 ONC_EXPORT extern const char kL2TP[];