| Index: chromeos/network/network_state.h
|
| diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
|
| index 91511318cf8813b6fa0795f8f96482107ae4efc1..6c56fedb8de1ecd6e11f28f533fc16808967f792 100644
|
| --- a/chromeos/network/network_state.h
|
| +++ b/chromeos/network/network_state.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/values.h"
|
| #include "chromeos/network/managed_state.h"
|
| +#include "chromeos/network/network_ui_data.h"
|
| #include "chromeos/network/onc/onc_constants.h"
|
|
|
| namespace chromeos {
|
| @@ -50,7 +51,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
|
| bool favorite() const { return favorite_; }
|
| int priority() const { return priority_; }
|
| const base::DictionaryValue& proxy_config() const { return proxy_config_; }
|
| - onc::ONCSource onc_source() const { return onc_source_; }
|
| + const NetworkUIData& ui_data() const { return ui_data_; }
|
| // IPConfig Properties
|
| const std::string& ip_address() const { return ip_address_; }
|
| const std::string& gateway() const { return gateway_; }
|
| @@ -98,9 +99,9 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
|
| // key.
|
| static std::string IPConfigProperty(const char* key);
|
|
|
| - // Sets |out| to the ONCSource specified by the UIData property |value|.
|
| - // Returns true if the source was successfully parsed.
|
| - static bool GetOncSource(const base::Value& value, onc::ONCSource* out);
|
| + // Sets |out| to the UIData sepcified by |value|. Returns true successfully
|
| + // parsed.
|
| + static bool GetUIDataFromValue(const base::Value& value, NetworkUIData* out);
|
|
|
| private:
|
| friend class NetworkStateHandler;
|
| @@ -126,7 +127,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
|
| // TODO(pneubeck): Remove ProxyConfig once NetworkConfigurationHandler
|
| // provides proxy configuration. crbug/241775
|
| base::DictionaryValue proxy_config_;
|
| - onc::ONCSource onc_source_;
|
| + NetworkUIData ui_data_;
|
| // IPConfig properties.
|
| // Note: These do not correspond to actual Shill.Service properties
|
| // but are derived from the service's corresponding IPConfig object.
|
|
|