Chromium Code Reviews| Index: chromeos/network/network_state.h |
| diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h |
| index d49c5d865cd0dae87600e27d9aa93305c4ec03b6..552d50a56359f5bd3c6c900bc9dd1ac36027953f 100644 |
| --- a/chromeos/network/network_state.h |
| +++ b/chromeos/network/network_state.h |
| @@ -8,11 +8,9 @@ |
| #include <string> |
| #include <vector> |
| +#include "base/values.h" |
| #include "chromeos/network/managed_state.h" |
| - |
| -namespace base { |
| -class DictionaryValue; |
| -} |
| +#include "chromeos/network/onc/onc_constants.h" |
| namespace chromeos { |
| @@ -49,6 +47,8 @@ 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_; } |
| + onc::ONCSource onc_source() const { return onc_source_; } |
| // Wireless property accessors |
| int signal_strength() const { return signal_strength_; } |
| bool connectable() const { return connectable_; } |
| @@ -99,6 +99,8 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState { |
| bool auto_connect_; |
| bool favorite_; |
| int priority_; |
| + base::DictionaryValue proxy_config_; |
|
stevenjb
2013/05/15 17:44:14
This will conflict with gaurav's CL: https://coder
pneubeck (no reviews)
2013/05/15 20:24:48
I know. I planned to overwrite his string.
|
| + onc::ONCSource onc_source_; |
| // IPConfig properties. |
| // Note: These do not correspond to actual Shill.Service properties |
| // but are derived from the service's corresponding IPConfig object. |