Index: chrome/browser/chromeos/cros/network_library.h |
=================================================================== |
--- chrome/browser/chromeos/cros/network_library.h (revision 113135) |
+++ chrome/browser/chromeos/cros/network_library.h (working copy) |
@@ -90,8 +90,6 @@ |
PROPERTY_INDEX_IDENTITY, |
PROPERTY_INDEX_IMEI, |
PROPERTY_INDEX_IMSI, |
- PROPERTY_INDEX_IPSEC_AUTHENTICATIONTYPE, |
- PROPERTY_INDEX_IPSEC_IKEVERSION, |
PROPERTY_INDEX_IS_ACTIVE, |
PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS, |
PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_ID, |
@@ -111,47 +109,6 @@ |
PROPERTY_INDEX_NETWORKS, |
PROPERTY_INDEX_NETWORK_TECHNOLOGY, |
PROPERTY_INDEX_OFFLINE_MODE, |
- PROPERTY_INDEX_OLP, |
- PROPERTY_INDEX_ONC_CLIENT_CERT_PATTERN, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_CLIENT_CERT_REF, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_CLIENT_CERT_TYPE, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_IPSEC, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_L2TP, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_OPENVPN, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_REMOVE, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_WIFI, // Used internally for ONC parsing |
- PROPERTY_INDEX_ONC_VPN, // Used internally for ONC parsing |
- PROPERTY_INDEX_OPEN_VPN_AUTH, |
- PROPERTY_INDEX_OPEN_VPN_AUTHRETRY, |
- PROPERTY_INDEX_OPEN_VPN_AUTHNOCACHE, |
- PROPERTY_INDEX_OPEN_VPN_AUTHUSERPASS, |
- PROPERTY_INDEX_OPEN_VPN_CACERT, |
- PROPERTY_INDEX_OPEN_VPN_CERT, |
- PROPERTY_INDEX_OPEN_VPN_CIPHER, |
- PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID, |
- PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_SLOT, |
- PROPERTY_INDEX_OPEN_VPN_COMPLZO, |
- PROPERTY_INDEX_OPEN_VPN_COMPNOADAPT, |
- PROPERTY_INDEX_OPEN_VPN_KEYDIRECTION, |
- PROPERTY_INDEX_OPEN_VPN_MGMT_ENABLE, |
- PROPERTY_INDEX_OPEN_VPN_NSCERTTYPE, |
- PROPERTY_INDEX_OPEN_VPN_OTP, |
- PROPERTY_INDEX_OPEN_VPN_PASSWORD, |
- PROPERTY_INDEX_OPEN_VPN_PIN, |
- PROPERTY_INDEX_OPEN_VPN_PORT, |
- PROPERTY_INDEX_OPEN_VPN_PROTO, |
- PROPERTY_INDEX_OPEN_VPN_PKCS11_PROVIDER, |
- PROPERTY_INDEX_OPEN_VPN_PUSHPEERINFO, |
- PROPERTY_INDEX_OPEN_VPN_REMOTECERTEKU, |
- PROPERTY_INDEX_OPEN_VPN_REMOTECERTKU, |
- PROPERTY_INDEX_OPEN_VPN_REMOTECERTTLS, |
- PROPERTY_INDEX_OPEN_VPN_RENEGSEC, |
- PROPERTY_INDEX_OPEN_VPN_SERVERPOLLTIMEOUT, |
- PROPERTY_INDEX_OPEN_VPN_SHAPER, |
- PROPERTY_INDEX_OPEN_VPN_STATICCHALLENGE, |
- PROPERTY_INDEX_OPEN_VPN_TLSAUTHCONTENTS, |
- PROPERTY_INDEX_OPEN_VPN_TLSREMOTE, |
- PROPERTY_INDEX_OPEN_VPN_USER, |
PROPERTY_INDEX_OPERATOR_CODE, |
PROPERTY_INDEX_OPERATOR_NAME, |
PROPERTY_INDEX_PASSPHRASE, |
@@ -159,13 +116,12 @@ |
PROPERTY_INDEX_PORTAL_URL, |
PROPERTY_INDEX_POWERED, |
PROPERTY_INDEX_PRIORITY, |
- PROPERTY_INDEX_PROVIDER_HOST, |
- PROPERTY_INDEX_PROVIDER_TYPE, |
PROPERTY_INDEX_PRL_VERSION, |
PROPERTY_INDEX_PROFILE, |
PROPERTY_INDEX_PROFILES, |
PROPERTY_INDEX_PROVIDER, |
PROPERTY_INDEX_PROXY_CONFIG, |
+ PROPERTY_INDEX_REMOVE, |
PROPERTY_INDEX_ROAMING_STATE, |
PROPERTY_INDEX_SAVE_CREDENTIALS, |
PROPERTY_INDEX_SCANNING, |
@@ -184,12 +140,15 @@ |
PROPERTY_INDEX_UI_DATA, |
PROPERTY_INDEX_UNKNOWN, |
PROPERTY_INDEX_USAGE_URL, |
- PROPERTY_INDEX_VPN_DOMAIN, |
+ PROPERTY_INDEX_OLP, |
+ PROPERTY_INDEX_OPEN_VPN_USER, |
+ PROPERTY_INDEX_OPEN_VPN_PASSWORD, |
+ PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID, |
PROPERTY_INDEX_WIFI_AUTH_MODE, |
PROPERTY_INDEX_WIFI_FREQUENCY, |
PROPERTY_INDEX_WIFI_HEX_SSID, |
PROPERTY_INDEX_WIFI_HIDDEN_SSID, |
- PROPERTY_INDEX_WIFI_PHY_MODE |
+ PROPERTY_INDEX_WIFI_PHY_MODE, |
}; |
// Connection enums (see flimflam/include/service.h) |
@@ -712,10 +671,6 @@ |
const base::Value& value, |
PropertyIndex* index); |
- // Retrieves a property from the property_map_. If |value| is NULL, |
- // just returns whether or not the given property was found. |
- bool GetProperty(PropertyIndex index, const base::Value** value) const; |
- |
protected: |
Network(const std::string& service_path, |
ConnectionType type); |
@@ -765,7 +720,6 @@ |
friend class NativeNetworkParser; |
friend class NativeVirtualNetworkParser; |
friend class OncNetworkParser; |
- friend class OncWifiNetworkParser; |
friend class OncVirtualNetworkParser; |
// This allows the implementation classes access to privates. |