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

Unified Diff: ash/system/chromeos/network/tray_network_state_observer.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: . 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: ash/system/chromeos/network/tray_network_state_observer.cc
diff --git a/ash/system/chromeos/network/tray_network_state_observer.cc b/ash/system/chromeos/network/tray_network_state_observer.cc
index d829a234117314cf94e2c22ecc84efb71abe9568..75f52637d7ac69f40592a504b22c651cb75496cf 100644
--- a/ash/system/chromeos/network/tray_network_state_observer.cc
+++ b/ash/system/chromeos/network/tray_network_state_observer.cc
@@ -11,16 +11,18 @@
#include "chromeos/network/network_state_handler.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
+using chromeos::NetworkHandler;
+
namespace ash {
namespace internal {
TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate)
: delegate_(delegate) {
- chromeos::NetworkStateHandler::Get()->AddObserver(this);
+ NetworkHandler::Get()->network_state_handler()->AddObserver(this);
}
TrayNetworkStateObserver::~TrayNetworkStateObserver() {
- chromeos::NetworkStateHandler::Get()->RemoveObserver(this);
+ NetworkHandler::Get()->network_state_handler()->RemoveObserver(this);
}
void TrayNetworkStateObserver::NetworkManagerChanged() {
@@ -42,7 +44,8 @@ void TrayNetworkStateObserver::DefaultNetworkChanged(
void TrayNetworkStateObserver::NetworkPropertiesUpdated(
const chromeos::NetworkState* network) {
- if (network == chromeos::NetworkStateHandler::Get()->DefaultNetwork())
+ if (network ==
+ NetworkHandler::Get()->network_state_handler()->DefaultNetwork())
delegate_->NetworkStateChanged(true);
delegate_->NetworkServiceChanged(network);
}

Powered by Google App Engine
This is Rietveld 408576698