diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 05:04:54 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 05:04:54 +0000 |
| commit | bb986d1adc7eca8914049d334888419c225094ec (patch) | |
| tree | 96932df73388bcd6668a08c0343ba2d6daced639 /chromeos/network/network_state.h | |
| parent | 3103f2195f9407ebcb102a1a36032d75d97cceb1 (diff) | |
| download | chromium_src-bb986d1adc7eca8914049d334888419c225094ec.zip chromium_src-bb986d1adc7eca8914049d334888419c225094ec.tar.gz chromium_src-bb986d1adc7eca8914049d334888419c225094ec.tar.bz2 | |
Revert 202478 "Revert 202388 "Remove NetworkStateInformer's depe..."
Reverting the speculative revert
> Revert 202388 "Remove NetworkStateInformer's dependency on Proxy..."
>
> Suspected to break CrOS ASAN (x86) bot.
>
> > Remove NetworkStateInformer's dependency on ProxyConfigServiceImpl.
> >
> > This also completes NetworkStateInformer's migration from NetworkLibrary to
> > NetworkStateHandler
> >
> > BUG=189009
> >
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201688
> >
> > R=stevenjb@chromium.org, ygorshenin@chromium.org
> >
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202192
> >
> > Review URL: https://codereview.chromium.org/15294010
>
> TBR=pneubeck@chromium.org
>
> Review URL: https://codereview.chromium.org/15875018
TBR=kinuko@chromium.org
Review URL: https://codereview.chromium.org/15954007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_state.h')
| -rw-r--r-- | chromeos/network/network_state.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h index c78d5e8..4718820 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. @@ -45,12 +42,12 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState { const std::string& guid() const { return guid_; } const std::string& connection_state() const { return connection_state_; } const std::string& profile_path() const { return profile_path_; } - const std::string& proxy_config() const { return proxy_config_; } const std::string& error() const { return error_; } const std::string& error_details() const { return error_details_; } 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_; } @@ -100,12 +97,14 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState { std::string guid_; std::string connection_state_; std::string profile_path_; - std::string proxy_config_; std::string error_; std::string error_details_; 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. |