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_list_detailed_view.h"
@@ skipping 20 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)
         return IDR_AURA_UBER_TRAY_CELLULAR_NETWORK_FAILED;
       else
         return IDR_AURA_UBER_TRAY_NETWORK_FAILED;
     case NetworkObserver::ERROR_OUT_OF_CREDITS:
     case NetworkObserver::MESSAGE_DATA_PROMO:
       if (network_type == TrayNetwork::NETWORK_CELLULAR_LTE)
         return IDR_AURA_UBER_TRAY_NOTIFICATION_LTE;
       else
         return IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
   }
   NOTREACHED();
   return 0;
 }
 
 bool UseNewNetworkHandlers() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
-      ash::switches::kAshDisableNewNetworkStatusArea) &&
-      NetworkStateHandler::IsInitialized();
+      ash::switches::kAshDisableNewNetworkStatusArea);
 }
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class NetworkMessages {
@@ skipping 58 matching lines @@
 
   void Update(const NetworkIconInfo& info) {
     if (UseNewNetworkHandlers())
       return;
     UpdateIcon(info.tray_icon_visible, info.image);
     UpdateConnectionStatus(info.name, info.connected);
   }
 
   void UpdateNetworkStateHandlerIcon() {
     DCHECK(UseNewNetworkHandlers());
-    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 256 matching lines @@
 }  // namespace tray
 
 TrayNetwork::TrayNetwork(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
       messages_(new tray::NetworkMessages()),
       request_wifi_view_(false) {
-  if (UseNewNetworkHandlers())
+  if (UseNewNetworkHandlers()) {
     network_state_observer_.reset(new TrayNetworkStateObserver(this));
-  if (NetworkStateHandler::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);
@@ skipping 126 matching lines @@
 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