| Index: chromeos/network/network_state.cc
|
| diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
|
| index 3aa0472174b3f2ed729e632706b11bd27498982d..c1d987b521e698f90347d4fd1e2e31ad464c080b 100644
|
| --- a/chromeos/network/network_state.cc
|
| +++ b/chromeos/network/network_state.cc
|
| @@ -105,6 +105,8 @@ bool NetworkState::PropertyChanged(const std::string& key,
|
| return GetStringValue(key, value, &guid_);
|
| } else if (key == flimflam::kProfileProperty) {
|
| return GetStringValue(key, value, &profile_path_);
|
| + } else if (key == flimflam::kProxyConfigProperty) {
|
| + return GetStringValue(key, value, &proxy_config_);
|
| } else if (key == shill::kActivateOverNonCellularNetworkProperty) {
|
| return GetBooleanValue(key, value, &activate_over_non_cellular_networks_);
|
| } else if (key == shill::kOutOfCreditsProperty) {
|
| @@ -165,6 +167,8 @@ void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
|
| dictionary->SetStringWithoutPathExpansion(flimflam::kGuidProperty, guid());
|
| dictionary->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
|
| profile_path());
|
| + dictionary->SetStringWithoutPathExpansion(flimflam::kProxyConfigProperty,
|
| + proxy_config());
|
| dictionary->SetBooleanWithoutPathExpansion(
|
| shill::kActivateOverNonCellularNetworkProperty,
|
| activate_over_non_cellular_networks());
|
|
|