Chrome OS: adjust wifi icons.

ash/system/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/network/tray_network.h"
 
 #include "ash/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
@@ skipping 10 matching lines @@
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_utils.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image_skia_operations.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 chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
@@ skipping 93 matching lines @@
   }
 
   ~NetworkDefaultView() override {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   void Update() {
     gfx::ImageSkia image;
     base::string16 label;
     bool animating = false;
-    // TODO(bruthig): Update the image to use the proper color. See
-    // https://crbug.com/632027.
     network_icon::GetDefaultNetworkImageAndLabel(
         network_icon::ICON_TYPE_DEFAULT_VIEW, &image, &label, &animating);
+    // We use the inactive icon alpha only if there is no active network and
+    // wifi is disabled.
+    if (!IsActive() &&
+        !NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
+            NetworkTypePattern::WiFi())) {
+      image = gfx::ImageSkiaOperations::CreateTransparentImage(
+          image, TrayPopupItemStyle::kInactiveIconAlpha);
+    }
+
     if (animating)
       network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
     else
       network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
     SetImage(image);
     SetLabel(label);
     SetAccessibleName(label);
     UpdateStyle();
   }
 
   // network_icon::AnimationObserver
   void NetworkIconChanged() override { Update(); }
 
  protected:
   // TrayItemMore:
   std::unique_ptr<TrayPopupItemStyle> HandleCreateStyle() const override {
     std::unique_ptr<TrayPopupItemStyle> style =
         TrayItemMore::HandleCreateStyle();
-    style->set_color_style(GetConnectedNetwork() != nullptr
+    style->set_color_style(IsActive()
                                ? TrayPopupItemStyle::ColorStyle::ACTIVE
                                : TrayPopupItemStyle::ColorStyle::INACTIVE);
     return style;
   }
 
+  // Determines whether to use the ACTIVE or INACTIVE text style.
+  bool IsActive() const { return GetConnectedNetwork() != nullptr; }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
 class NetworkWifiDetailedView : public NetworkDetailedView {
  public:
   explicit NetworkWifiDetailedView(SystemTrayItem* owner)
       : NetworkDetailedView(owner) {}
 
   ~NetworkWifiDetailedView() override {}
@@ skipping 15 matching lines @@
     box_layout->SetFlexForView(label_view_, 1);
 
     Update();
   }
 
   NetworkDetailedView::DetailedViewType GetViewType() const override {
     return NetworkDetailedView::WIFI_VIEW;
   }
 
   void Update() override {
-    bool wifi_enabled =
+    const bool wifi_enabled =
         NetworkHandler::Get()->network_state_handler()->IsTechnologyEnabled(
             NetworkTypePattern::WiFi());
     image_view_->SetImage(
-        network_icon::GetBasicImageForWiFiNetwork(wifi_enabled));
+        network_icon::GetImageForWiFiEnabledState(wifi_enabled));
 
     const int string_id = wifi_enabled
                               ? IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED
                               : IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
     label_view_->SetText(l10n_util::GetStringUTF16(string_id));
   }
 
  private:
   views::ImageView* image_view_ = nullptr;
   views::Label* label_view_ = nullptr;
@@ skipping 90 matching lines @@
 void TrayNetwork::NetworkStateChanged() {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash