Update appearance of Wi-Fi toggle notification.

ash/common/system/chromeos/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/common/system/chromeos/network/network_icon.h"
 
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/resources/grit/ash_resources.h"
@@ skipping 43 matching lines @@
 // The badge offsets are different depending on whether the icon is in the tray
 // or menu.
 const int kTrayIconBadgeOffset = 3;
 const int kMenuIconBadgeOffset = 2;
 
 //------------------------------------------------------------------------------
 // Struct to pass icon badges to NetworkIconImageSource.
 struct Badges {
   gfx::ImageSkia top_left;
   gfx::ImageSkia top_right;
+  gfx::ImageSkia center;
   gfx::ImageSkia bottom_left;
   gfx::ImageSkia bottom_right;
 };
 
 //------------------------------------------------------------------------------
 // class used for maintaining a map of network state and images.
 class NetworkIconImpl {
  public:
   NetworkIconImpl(const std::string& path, IconType icon_type);
 
@@ skipping 143 matching lines @@
 
     // The badges are flush against the edges of the canvas, except at the top,
     // where the badge is only 1dp higher than the base image.
     const int top_badge_y = icon_y - 1;
     if (!badges_.top_left.isNull())
       canvas->DrawImageInt(badges_.top_left, 0, top_badge_y);
     if (!badges_.top_right.isNull()) {
       canvas->DrawImageInt(badges_.top_right, width - badges_.top_right.width(),
                            top_badge_y);
     }
+    if (!badges_.center.isNull()) {
+      canvas->DrawImageInt(badges_.center, (width - badges_.center.width()) / 2,
+                           (height - badges_.center.height()) / 2);
+    }
     if (!badges_.bottom_left.isNull()) {
       canvas->DrawImageInt(badges_.bottom_left, 0,
                            height - badges_.bottom_left.height());
     }
     if (!badges_.bottom_right.isNull()) {
       canvas->DrawImageInt(badges_.bottom_right,
                            width - badges_.bottom_right.width(),
                            height - badges_.bottom_right.height());
     }
   }
@@ skipping 536 matching lines @@
       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;
   badges.bottom_right =
       gfx::CreateVectorIcon(kNetworkBadgeAddOtherIcon, badge_color);
   return NetworkIconImageSource::CreateImage(icon, badges);
 }
 
+gfx::ImageSkia GetImageForWifiChipState(bool enabled) {
+  SignalStrengthImageSource* source =
+      new SignalStrengthImageSource(ImageTypeForNetworkType(shill::kTypeWifi),
+                                    ICON_TYPE_LIST, kNumNetworkImages - 1);
+  gfx::ImageSkia icon = gfx::ImageSkia(source, source->size());

[James Cook, 2017/03/21 19:57:31]

Aside, unrelated to this CL: It's a bummer that gfx::ImageSkia() doesn't take a
unique_ptr<> for source.

+  Badges badges;
+  if (!enabled)
+    badges.center = gfx::CreateVectorIcon(kNetworkBadgeOffIcon, kMenuIconColor);
+  return NetworkIconImageSource::CreateImage(icon, badges);
+}
+
 base::string16 GetLabelForNetwork(const chromeos::NetworkState* network,
                                   IconType icon_type) {
   DCHECK(network);
   std::string activation_state = network->activation_state();
   if (icon_type == ICON_TYPE_LIST || icon_type == ICON_TYPE_MENU_LIST) {
     // Show "<network>: [Connecting|Activating|Reconnecting]..."
     // TODO(varkha): Remaining states should migrate to secondary status in the
     // network item and no longer be part of the label.
     // See http://crbug.com/676181 .
     if (network->IsReconnecting()) {
@@ skipping 155 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