Chrome OS: adjust wifi icons.

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 418 matching lines @@
 }
 
 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.
+// Returns an image to represent either a fully connected network or a
+// disconnected network.
 const gfx::ImageSkia GetBasicImage(bool connected,
                                    IconType icon_type,
                                    const std::string& network_type) {
   DCHECK_NE(shill::kTypeVPN, network_type);
-  SignalStrengthImageSource* source = new SignalStrengthImageSource(
-      ImageTypeForNetworkType(network_type), icon_type, kNumNetworkImages - 1);
-  gfx::ImageSkia icon = gfx::ImageSkia(source, source->size());
-  Badges badges;
-  if (!connected) {
-    badges.center = {&kNetworkBadgeOffIcon,
-                     GetDefaultColorForIconType(icon_type)};
-  }
-  return NetworkIconImageSource::CreateImage(icon, badges);
+  return GetImageForIndex(ImageTypeForNetworkType(network_type), icon_type,
+                          connected ? kNumNetworkImages - 1 : 0);
 }
 
 gfx::ImageSkia* ConnectingWirelessImage(ImageType image_type,
                                         IconType icon_type,
                                         double animation) {
   static const int kImageCount = kNumNetworkImages - 1;
   static gfx::ImageSkia* s_bars_images_dark[kImageCount];
   static gfx::ImageSkia* s_bars_images_light[kImageCount];
   static gfx::ImageSkia* s_arcs_images_dark[kImageCount];
   static gfx::ImageSkia* s_arcs_images_light[kImageCount];
@@ skipping 298 matching lines @@
   if (!network->visible())
     return GetBasicImage(false, icon_type, network->type());
 
   if (network->IsConnectingState())
     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 GetImageForWiFiEnabledState(bool enabled, IconType icon_type) {
+  gfx::ImageSkia image =
+      GetBasicImage(true /* connected */, icon_type, shill::kTypeWifi);
+  Badges badges;
+  if (!enabled) {
+    badges.center = {&kNetworkBadgeOffIcon,
+                     GetDefaultColorForIconType(icon_type)};
+  }
+  return NetworkIconImageSource::CreateImage(image, badges);
 }
 
 gfx::ImageSkia GetImageForDisconnectedCellNetwork() {
-  return GetBasicImage(false, ICON_TYPE_LIST, shill::kTypeCellular);
+  return GetBasicImage(false /* not connected */, ICON_TYPE_LIST,
+                       shill::kTypeCellular);
 }
 
 gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color,
                                          SkColor badge_color) {
   SignalStrengthImageSource* source =
       new SignalStrengthImageSource(ImageTypeForNetworkType(shill::kTypeWifi),
                                     ICON_TYPE_LIST, kNumNetworkImages - 1);
   source->set_color(icon_color);
   gfx::ImageSkia icon = gfx::ImageSkia(source, source->size());
   Badges badges;
@@ skipping 135 matching lines @@
   }
   if (!network) {
     // If no connecting network, check for cellular initializing.
     int uninitialized_msg = GetCellularUninitializedMsg();
     if (uninitialized_msg != 0) {
       *image = GetConnectingImage(icon_type, shill::kTypeCellular);
       if (label)
         *label = l10n_util::GetStringUTF16(uninitialized_msg);
       *animating = true;
     } else {
-      // Otherwise show the disconnected wifi icon.
-      *image = GetBasicImage(false, icon_type, shill::kTypeWifi);
+      // 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 =
+          NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
+              NetworkTypePattern::WiFi());
+      *image = wifi_enabled ? GetBasicImage(false /* not connected */,
+                                            icon_type, shill::kTypeWifi)
+                            : GetImageForWiFiEnabledState(
+                                  false /* not enabled*/, icon_type);
       if (label) {
         *label = l10n_util::GetStringUTF16(
             IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);
       }
       *animating = false;
     }
     return;
   }
   *animating = network->IsConnectingState();
   // Get icon and label for connected or connecting network.
@@ skipping 12 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