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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.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: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 5d4ce200b55c07521576fb04a8b3c12e9fcdb451..6d4c8e04c05177592fc40148ba1aaaf8379fe80e 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -486,7 +486,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
std::string page = chrome::kInternetOptionsSubPage;
const chromeos::NetworkState* network = service_path.empty() ? NULL :
- chromeos::NetworkStateHandler::Get()->GetNetworkState(service_path);
+ NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+ service_path);
if (network) {
std::string name(network->name());
if (name.empty() && network->type() == flimflam::kTypeEthernet)
@@ -747,7 +748,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE {
const chromeos::NetworkState* network = network_id.empty() ? NULL :
- chromeos::NetworkStateHandler::Get()->GetNetworkState(network_id);
+ NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+ network_id);
if (!network) {
LOG(ERROR) << "ConfigureNetwork: Network not found: " << network_id;
return;

Powered by Google App Engine
This is Rietveld 408576698