Add Tether to Mobile NetworkTypePattern.

ash/system/network/network_icon.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/network/network_icon.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_icon_animation_observer.h"
@@ skipping 860 matching lines @@
   }
 
   // Otherwise just show the network name or 'Ethernet'.
   if (network->Matches(NetworkTypePattern::Ethernet())) {
     return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ETHERNET);
   } else {
     return base::UTF8ToUTF16(network->name());
   }
 }
 
-int GetCellularUninitializedMsg() {
+int GetMobileUninitializedMsg() {
   static base::Time s_uninitialized_state_time;
   static int s_uninitialized_msg(0);
 
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   if (handler->GetTechnologyState(NetworkTypePattern::Mobile()) ==
       NetworkStateHandler::TECHNOLOGY_UNINITIALIZED) {
+    // TODO (lesliewatkins): Add a more descriptive message (e.g. "Enable
+    // Bluetooth") for Tether technology type.
     s_uninitialized_msg = IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR;
     s_uninitialized_state_time = base::Time::Now();
     return s_uninitialized_msg;
   } else if (handler->GetScanningByType(NetworkTypePattern::Mobile())) {
     s_uninitialized_msg = IDS_ASH_STATUS_TRAY_MOBILE_SCANNING;
     s_uninitialized_state_time = base::Time::Now();
     return s_uninitialized_msg;
   }
   // There can be a delay between leaving the Initializing state and when
-  // a Cellular device shows up, so keep showing the initializing
+  // a Mobile device shows up, so keep showing the initializing
   // animation for a bit to avoid flashing the disconnect icon.
   const int kInitializingDelaySeconds = 1;
   base::TimeDelta dtime = base::Time::Now() - s_uninitialized_state_time;
   if (dtime.InSeconds() < kInitializingDelaySeconds)
     return s_uninitialized_msg;
   return 0;
 }
 
 void GetDefaultNetworkImageAndLabel(IconType icon_type,
                                     gfx::ImageSkia* image,
@@ skipping 35 matching lines @@
   if (!network) {
     // If no connecting network, check if we are activating a network.
     const NetworkState* mobile_network =
         state_handler->FirstNetworkByType(NetworkTypePattern::Mobile());
     if (mobile_network && (mobile_network->activation_state() ==
                            shill::kActivationStateActivating)) {
       network = mobile_network;
     }
   }
   if (!network) {
-    // If no connecting network, check for cellular initializing.
-    int uninitialized_msg = GetCellularUninitializedMsg();
+    // If no connecting network, check for mobile initializing.
+    int uninitialized_msg = GetMobileUninitializedMsg();
     if (uninitialized_msg != 0) {
       *image = GetConnectingImage(icon_type, shill::kTypeCellular);
       if (label)
         *label = l10n_util::GetStringUTF16(uninitialized_msg);
       *animating = true;
     } else {
       // Otherwise show a Wi-Fi icon. If Wi-Fi is disabled, show a full icon
       // with a strikethrough. If it's enabled then it's disconnected, so show
       // an empty wedge.
       bool wifi_enabled =
@@ skipping 28 matching lines @@
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
   PurgeIconMap(ICON_TYPE_MENU_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash