Index: chrome/browser/chromeos/net/network_change_notifier_network_library.cc |
diff --git a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc |
index e6480bee2c7bb0183bbca073009b0234dd722e03..51325605216413c05b809c111ecb502ad88a00a1 100644 |
--- a/chrome/browser/chromeos/net/network_change_notifier_network_library.cc |
+++ b/chrome/browser/chromeos/net/network_change_notifier_network_library.cc |
@@ -71,7 +71,7 @@ void NetworkChangeNotifierNetworkLibrary::Init() { |
chromeos::NetworkLibrary* network_library = |
chromeos::CrosLibrary::Get()->GetNetworkLibrary(); |
network_library->AddNetworkManagerObserver(this); |
- |
+ DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); |
DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this); |
dns_config_service_.reset(new DnsConfigServiceChromeos()); |
@@ -95,9 +95,10 @@ void NetworkChangeNotifierNetworkLibrary::Shutdown() { |
lib->RemoveObserverForAllNetworks(this); |
DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this); |
+ DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); |
} |
-void NetworkChangeNotifierNetworkLibrary::OnResume( |
+void NetworkChangeNotifierNetworkLibrary::SystemResumed( |
const base::TimeDelta& sleep_duration) { |
// Force invalidation of various net resources on system resume. |
BrowserThread::PostTask( |
@@ -106,6 +107,11 @@ void NetworkChangeNotifierNetworkLibrary::OnResume( |
&NetworkChangeNotifier::NotifyObserversOfIPAddressChange)); |
} |
+void NetworkChangeNotifierNetworkLibrary::OnResume( |
+ const base::TimeDelta& sleep_duration) { |
+ SystemResumed(sleep_duration); |
+} |
+ |
void NetworkChangeNotifierNetworkLibrary::OnNetworkManagerChanged( |
chromeos::NetworkLibrary* cros) { |