Add NetworkHandler to own network handlers in src/chromeos/network

ash/system/chromeos/network/tray_network.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/network/tray_network.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
@@ skipping 18 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 using ash::internal::TrayNetwork;
 using ash::NetworkObserver;
+using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 
 namespace {
 
 int GetMessageIcon(NetworkObserver::MessageType message_type,
                    NetworkObserver::NetworkType network_type) {
   switch(message_type) {
     case NetworkObserver::ERROR_CONNECT_FAILED:
       if (NetworkObserver::NETWORK_CELLULAR == network_type)
@@ skipping 64 matching lines @@
 
   virtual ~NetworkTrayView() {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   virtual const char* GetClassName() const OVERRIDE {
     return "NetworkTrayView";
   }
 
   void UpdateNetworkStateHandlerIcon() {
-    NetworkStateHandler* handler = NetworkStateHandler::Get();
+    NetworkStateHandler* handler =
+        NetworkHandler::Get()->network_state_handler();
     gfx::ImageSkia image;
     base::string16 name;
     bool animating = false;
     network_tray_->GetNetworkStateHandlerImageAndLabel(
         network_icon::ICON_TYPE_TRAY, &image, &name, &animating);
     bool show_in_tray = !image.isNull();
     UpdateIcon(show_in_tray, image);
     if (animating)
       network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
     else
@@ skipping 124 matching lines @@
   virtual void NetworkListChanged() OVERRIDE {
     Update();
   }
 
   virtual void NetworkServiceChanged(
       const chromeos::NetworkState* network) OVERRIDE {
   }
 
  private:
   void Update() {
-    bool wifi_enabled =
-        NetworkStateHandler::Get()->IsTechnologyEnabled(flimflam::kTypeWifi);
+    bool wifi_enabled = NetworkHandler::Get()->network_state_handler()->
+        IsTechnologyEnabled(flimflam::kTypeWifi);
     const int image_id = wifi_enabled ?
         IDR_AURA_UBER_TRAY_WIFI_ENABLED : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     image_view_->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
 
     const int string_id = wifi_enabled ?
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED :
         IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
     label_view_->SetText(bundle.GetLocalizedString(string_id));
   }
@@ skipping 114 matching lines @@
 
 TrayNetwork::TrayNetwork(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
       messages_(new tray::NetworkMessages()),
       request_wifi_view_(false) {
   network_state_observer_.reset(new TrayNetworkStateObserver(this));
-  if (NetworkStateHandler::IsInitialized())
+  if (NetworkHandler::IsInitialized())
     network_state_notifier_.reset(new NetworkStateNotifier());
   Shell::GetInstance()->system_tray_notifier()->AddNetworkObserver(this);
 }
 
 TrayNetwork::~TrayNetwork() {
   network_state_notifier_.reset();
   Shell::GetInstance()->system_tray_notifier()->RemoveNetworkObserver(this);
 }
 
 views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_ == NULL);
-  if (!chromeos::NetworkStateHandler::IsInitialized())
+  if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   tray_ = new tray::NetworkTrayView(this);
   return tray_;
 }
 
 views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
-  if (!chromeos::NetworkStateHandler::IsInitialized())
+  if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   CHECK(tray_ != NULL);
   default_ = new tray::NetworkDefaultView(
       this, status != user::LOGGED_IN_LOCKED);
   return default_;
 }
 
 views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
-  if (!chromeos::NetworkStateHandler::IsInitialized())
+  if (!chromeos::NetworkHandler::IsInitialized())
     return NULL;
   // Clear any notifications when showing the detailed view.
   messages_->messages().clear();
   HideNotificationView();
   if (request_wifi_view_) {
     detailed_ = new tray::NetworkWifiDetailedView(this);
     request_wifi_view_ = false;
   } else {
     detailed_ = new tray::NetworkStateListDetailedView(
         this, tray::NetworkStateListDetailedView::LIST_TYPE_NETWORK, status);
@@ skipping 62 matching lines @@
     ShowNotificationView();
 }
 
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
     request_wifi_view_ = true;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   }
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   bool enabled = handler->IsTechnologyEnabled(flimflam::kTypeWifi);
   handler->SetTechnologyEnabled(
       flimflam::kTypeWifi, !enabled,
       chromeos::network_handler::ErrorCallback());
 }
 
 void TrayNetwork::NetworkStateChanged(bool list_changed) {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_) {
     if (list_changed)
       detailed_->NetworkListChanged();
     else
       detailed_->ManagerChanged();
   }
 }
 
 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) {
   if (detailed_)
     detailed_->NetworkServiceChanged(network);
 }
 
 void TrayNetwork::GetNetworkStateHandlerImageAndLabel(
     network_icon::IconType icon_type,
     gfx::ImageSkia* image,
     base::string16* label,
     bool* animating) {
-  NetworkStateHandler* handler = NetworkStateHandler::Get();
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   const NetworkState* connected_network = handler->ConnectedNetworkByType(
       NetworkStateHandler::kMatchTypeNonVirtual);
   const NetworkState* connecting_network = handler->ConnectingNetworkByType(
       NetworkStateHandler::kMatchTypeWireless);
   if (!connecting_network && icon_type == network_icon::ICON_TYPE_TRAY)
     connecting_network = handler->ConnectingNetworkByType(flimflam::kTypeVPN);
 
   const NetworkState* network;
   // If we are connecting to a network, and there is either no connected
   // network, or the connection was user requested, use the connecting
@@ skipping 53 matching lines @@
 
 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) {
   tray::NetworkMessages::MessageMap::const_iterator iter =
       messages()->messages().find(message_type);
   if (iter != messages()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked(message_type, link_id);
 }
 
 }  // namespace internal
 }  // namespace ash