summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_state_handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos/network/network_state_handler.cc')
-rw-r--r--chromeos/network/network_state_handler.cc27
1 files changed, 7 insertions, 20 deletions
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 8b4ff3c..c898446 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -421,27 +421,14 @@ bool NetworkStateHandler::ParseNetworkServiceProperty(
const std::string& key,
const base::Value& value) {
DCHECK(network);
- bool property_changed = false;
- if (key == shill::kIPConfigProperty) {
- // Handle IPConfig here instead of in NetworkState::PropertyChanged since
- // we need to call into shill_property_handler_ to fetch them. This will
- // trigger a call to UpdateNetworkServiceIPAddress(), which will notify
- // any observers.
- std::string ip_config_path;
- value.GetAsString(&ip_config_path);
- DCHECK(!ip_config_path.empty());
- shill_property_handler_->RequestIPConfig(network->path(), ip_config_path);
- } else {
- if (network->PropertyChanged(key, value)) {
- property_changed = true;
- if (network->path() == active_network_path_ &&
- key == flimflam::kStateProperty) {
- FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_,
- ActiveNetworkStateChanged(network));
- }
- }
+ if (!network->PropertyChanged(key, value))
+ return false;
+ if (network->path() == active_network_path_ &&
+ key == flimflam::kStateProperty) {
+ FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_,
+ ActiveNetworkStateChanged(network));
}
- return property_changed;
+ return true;
}
} // namespace chromeos