Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chromeos/network/network_state_handler.cc

Issue 238433003: Provide Shill IP Address to myIpAddress() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + feedback Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index aa91883ab1f970acc6a663a61eb14ce3c50e329d..e4e5f6e760ffba6eff9f5d5d5f4d7c459f989752 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -60,6 +60,7 @@ NetworkStateHandler::NetworkStateHandler() {
}
NetworkStateHandler::~NetworkStateHandler() {
+ FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, IsShuttingDown());
STLDeleteContainerPointers(network_list_.begin(), network_list_.end());
STLDeleteContainerPointers(device_list_.begin(), device_list_.end());
}
@@ -658,11 +659,19 @@ void NetworkStateHandler::UpdateIPConfigProperties(
if (!network)
return;
network->IPConfigPropertiesChanged(properties);
+ if (network->path() == default_network_path_)
+ NotifyDefaultNetworkChanged(network);
} else if (type == ManagedState::MANAGED_TYPE_DEVICE) {
DeviceState* device = GetModifiableDeviceState(path);
if (!device)
return;
device->IPConfigPropertiesChanged(ip_config_path, properties);
+ if (!default_network_path_.empty()) {
+ const NetworkState* default_network =
+ GetNetworkState(default_network_path_);
+ if (default_network && default_network->device_path() == path)
+ NotifyDefaultNetworkChanged(default_network);
+ }
}
}
« no previous file with comments | « chromeos/network/host_resolver_impl_chromeos_unittest.cc ('k') | chromeos/network/network_state_handler_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698