| Index: chromeos/network/network_state.h
|
| diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
|
| index d49c5d865cd0dae87600e27d9aa93305c4ec03b6..905b38adb3540004cfc0ec65b2677cca9f9eab8a 100644
|
| --- a/chromeos/network/network_state.h
|
| +++ b/chromeos/network/network_state.h
|
| @@ -8,12 +8,9 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/values.h"
|
| #include "chromeos/network/managed_state.h"
|
|
|
| -namespace base {
|
| -class DictionaryValue;
|
| -}
|
| -
|
| namespace chromeos {
|
|
|
| // Simple class to provide network state information about a network service.
|
| @@ -49,6 +46,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
|
| bool auto_connect() const { return auto_connect_; }
|
| bool favorite() const { return favorite_; }
|
| int priority() const { return priority_; }
|
| + const base::DictionaryValue& proxy_config() const { return proxy_config_; }
|
| // Wireless property accessors
|
| int signal_strength() const { return signal_strength_; }
|
| bool connectable() const { return connectable_; }
|
| @@ -99,6 +97,9 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
|
| bool auto_connect_;
|
| bool favorite_;
|
| int priority_;
|
| + // TODO(pneubeck): Remove this property once NetworkConfigurationHandler
|
| + // provides proxy configuration. crbug/241775
|
| + base::DictionaryValue proxy_config_;
|
| // IPConfig properties.
|
| // Note: These do not correspond to actual Shill.Service properties
|
| // but are derived from the service's corresponding IPConfig object.
|
|
|