Changed wifi arcs to mobile bars for Tether network.

ash/system/network/network_icon.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Kyle Horimoto, 2017/04/17 19:50:04]

Please add unit tests for the changes you made in this file.

[lesliewatkins, 2017/04/29 00:57:53]

Done.

 // 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"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 404 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SignalStrengthImageSource);
 };
 
 //------------------------------------------------------------------------------
 // Utilities for extracting icon images.
 
 ImageType ImageTypeForNetworkType(const std::string& type) {
   if (type == shill::kTypeWifi)
     return ARCS;
-  else if (type == shill::kTypeCellular || type == shill::kTypeWimax)
+  else if (type == shill::kTypeCellular || type == shill::kTypeWimax ||
+           type == chromeos::kTypeTether)
     return BARS;
   return NONE;
 }
 
+ImageType ImageTypeForNetwork(const NetworkState* network) {
+  if (network->type() == shill::kTypeWifi && !network->tether_guid().empty())

[Kyle Horimoto, 2017/04/17 19:50:04]

Add a comment explaining what this means.

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+    return ImageTypeForNetworkType(chromeos::kTypeTether);
+
+  return ImageTypeForNetworkType(network->type());
+}
+
 gfx::ImageSkia GetImageForIndex(ImageType image_type,
                                 IconType icon_type,
                                 int index) {
   gfx::CanvasImageSource* source =
       new SignalStrengthImageSource(image_type, icon_type, index);
   return gfx::ImageSkia(source, source->size());
 }
 
 // Returns an image to represent either a fully connected/enabled network or a
 // disconnected/disabled network.
@@ skipping 94 matching lines @@
 
 gfx::ImageSkia GetIcon(const NetworkState* network,
                        IconType icon_type,
                        int strength_index) {
   if (network->Matches(NetworkTypePattern::Ethernet())) {
     DCHECK_NE(ICON_TYPE_TRAY, icon_type);
     return gfx::CreateVectorIcon(kNetworkEthernetIcon,
                                  GetDefaultColorForIconType(ICON_TYPE_LIST));
   } else if (network->Matches(NetworkTypePattern::Wireless())) {
     DCHECK(strength_index > 0);
-    return GetImageForIndex(ImageTypeForNetworkType(network->type()), icon_type,
+    return GetImageForIndex(ImageTypeForNetwork(network), icon_type,
                             strength_index);
   } else if (network->Matches(NetworkTypePattern::VPN())) {
     DCHECK_NE(ICON_TYPE_TRAY, icon_type);
     return gfx::CreateVectorIcon(kNetworkVpnIcon,
                                  GetDefaultColorForIconType(ICON_TYPE_LIST));
   }
 
   NOTREACHED() << "Request for icon for unsupported type: " << network->type();
   return gfx::ImageSkia();
 }
@@ skipping 196 matching lines @@
 }
 
 }  // namespace
 
 //------------------------------------------------------------------------------
 // Public interface
 
 gfx::ImageSkia GetImageForNetwork(const NetworkState* network,
                                   IconType icon_type) {
   DCHECK(network);
+  std::string network_type = network->type();
+
   if (!network->visible())
-    return GetBasicImage(false, icon_type, network->type());
+    return GetBasicImage(false, icon_type, network_type);

[Kyle Horimoto, 2017/04/17 19:50:04]

nit: Add /* parameter_name */ after "false" so that readers know what false
represents.

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+
+  if (!network->tether_guid().empty()) {

[Kyle Horimoto, 2017/04/17 19:50:03]

Also add an explanatory comment here.

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+    network_type = chromeos::kTypeTether;

[Kyle Horimoto, 2017/04/17 19:50:03]

You do this check in ImageTypeForNetwork as well. Can you combine these to share
code?

[lesliewatkins, 2017/04/27 00:33:53]

Done.

+  }
 
   if (network->IsConnectingState())
-    return GetConnectingImage(icon_type, network->type());
+    return GetConnectingImage(icon_type, network_type);
 
   NetworkIconImpl* icon = FindAndUpdateImageImpl(network, icon_type);
   return icon->image();
 }
 
 gfx::ImageSkia GetBasicImageForWiFiNetwork(bool connected) {
   return GetBasicImage(connected, ICON_TYPE_LIST, shill::kTypeWifi);
 }
 
 gfx::ImageSkia GetImageForDisconnectedCellNetwork() {
@@ skipping 180 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