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

Unified Diff: chromeos/network/network_change_notifier_chromeos.cc

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos_unittests Created 7 years, 7 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_change_notifier_chromeos.cc
diff --git a/chromeos/network/network_change_notifier_chromeos.cc b/chromeos/network/network_change_notifier_chromeos.cc
index 224930ccb47e3838c46531c3a4c55eda6bf0c8ba..8afc7de9d80869a0ae6de2049d3b0a22811bdca3 100644
--- a/chromeos/network/network_change_notifier_chromeos.cc
+++ b/chromeos/network/network_change_notifier_chromeos.cc
@@ -58,20 +58,20 @@ NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
void NetworkChangeNotifierChromeos::Initialize() {
DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
- NetworkStateHandler::Get()->AddObserver(this);
+ NetworkHandler::Get()->network_state_handler()->AddObserver(this);
dns_config_service_.reset(new DnsConfigService());
dns_config_service_->WatchConfig(
base::Bind(net::NetworkChangeNotifier::SetDnsConfig));
// Update initial connection state.
- DefaultNetworkChanged(NetworkStateHandler::Get()->DefaultNetwork());
+ DefaultNetworkChanged(
+ NetworkHandler::Get()->network_state_handler()->DefaultNetwork());
}
void NetworkChangeNotifierChromeos::Shutdown() {
dns_config_service_.reset();
- if (NetworkStateHandler::Get())
- NetworkStateHandler::Get()->RemoveObserver(this);
+ NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
}
@@ -210,4 +210,3 @@ NetworkChangeNotifierChromeos::NetworkChangeCalculatorParamsChromeos() {
}
} // namespace chromeos
-
« no previous file with comments | « chromeos/network/managed_network_configuration_handler_unittest.cc ('k') | chromeos/network/network_configuration_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698