Index: chromeos/network/network_ui_data.h |
diff --git a/chromeos/network/network_ui_data.h b/chromeos/network/network_ui_data.h |
index 42658c410bb0b5c80eb4fed5f4c237e420478e80..66cb2361cb6d14c7cbee5a33ee9fbc5ce747a20e 100644 |
--- a/chromeos/network/network_ui_data.h |
+++ b/chromeos/network/network_ui_data.h |
@@ -10,7 +10,6 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "chromeos/chromeos_export.h" |
-#include "chromeos/network/certificate_pattern.h" |
#include "components/onc/onc_constants.h" |
namespace base { |
@@ -19,12 +18,6 @@ class DictionaryValue; |
namespace chromeos { |
-enum ClientCertType { |
- CLIENT_CERT_TYPE_NONE = 0, |
- CLIENT_CERT_TYPE_REF = 1, |
- CLIENT_CERT_TYPE_PATTERN = 2 |
-}; |
- |
// Helper for accessing and setting values in the network's UI data dictionary. |
// Accessing values is done via static members that take the network as an |
// argument. In order to fill a UI data dictionary, construct an instance, set |
@@ -32,7 +25,6 @@ enum ClientCertType { |
// |network|: |
// |
// NetworkUIData ui_data; |
-// ui_data.set_onc_source(onc::ONC_SOURCE_USER_IMPORT); |
// ui_data.FillDictionary(network->ui_data()); |
class CHROMEOS_EXPORT NetworkUIData { |
public: |
@@ -42,35 +34,12 @@ class CHROMEOS_EXPORT NetworkUIData { |
explicit NetworkUIData(const base::DictionaryValue& dict); |
~NetworkUIData(); |
- void set_onc_source(::onc::ONCSource onc_source) { onc_source_ = onc_source; } |
::onc::ONCSource onc_source() const { return onc_source_; } |
- void set_certificate_pattern(const CertificatePattern& pattern) { |
- certificate_pattern_ = pattern; |
- } |
- const CertificatePattern& certificate_pattern() const { |
- return certificate_pattern_; |
- } |
- void set_certificate_type(ClientCertType type) { |
- certificate_type_ = type; |
- } |
- ClientCertType certificate_type() const { |
- return certificate_type_; |
- } |
- bool is_managed() const { |
- return onc_source_ == ::onc::ONC_SOURCE_DEVICE_POLICY || |
- onc_source_ == ::onc::ONC_SOURCE_USER_POLICY; |
- } |
const base::DictionaryValue* user_settings() const { |
return user_settings_.get(); |
} |
void set_user_settings(scoped_ptr<base::DictionaryValue> dict); |
- const std::string& policy_guid() const { |
- return policy_guid_; |
- } |
- void set_policy_guid(const std::string& guid) { |
- policy_guid_ = guid; |
- } |
// Returns |onc_source_| as a string, one of kONCSource*. |
std::string GetONCSourceAsString() const; |
@@ -79,23 +48,13 @@ class CHROMEOS_EXPORT NetworkUIData { |
// keys appropriate for Network::ui_data() as defined below (kKeyXXX). |
void FillDictionary(base::DictionaryValue* dict) const; |
- // Creates a NetworkUIData object from |onc_network|, which has to be a valid |
- // ONC NetworkConfiguration dictionary. |
- // This function is used to create the "UIData" field of the Shill |
- // configuration. |
- static scoped_ptr<NetworkUIData> CreateFromONC( |
- ::onc::ONCSource onc_source, |
- const base::DictionaryValue& onc_network); |
+ // Creates a NetworkUIData object from |onc_source|. This function is used to |
+ // create the "UIData" property of the Shill configuration. |
+ static scoped_ptr<NetworkUIData> CreateFromONC(::onc::ONCSource onc_source); |
// Key for storing source of the ONC network. |
static const char kKeyONCSource[]; |
- // Key for storing the certificate pattern. |
- static const char kKeyCertificatePattern[]; |
- |
- // Key for storing the certificate type. |
- static const char kKeyCertificateType[]; |
- |
// Key for storing the user settings. |
static const char kKeyUserSettings[]; |
@@ -105,11 +64,8 @@ class CHROMEOS_EXPORT NetworkUIData { |
static const char kONCSourceUserPolicy[]; |
private: |
- CertificatePattern certificate_pattern_; |
::onc::ONCSource onc_source_; |
- ClientCertType certificate_type_; |
scoped_ptr<base::DictionaryValue> user_settings_; |
- std::string policy_guid_; |
}; |
} // namespace chromeos |