Materialized the font/icon color for some default rows in the system menu.

ash/common/system/chromeos/network/tray_vpn.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/tray_vpn.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_chromeos_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/network/network_icon.h"
 #include "ui/chromeos/network/network_icon_animation.h"
 #include "ui/chromeos/network/network_icon_animation_observer.h"
 
 using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace tray {
 
 class VpnDefaultView : public TrayItemMore,
                        public ui::network_icon::AnimationObserver {
  public:
   VpnDefaultView(SystemTrayItem* owner, bool show_more)
-      : TrayItemMore(owner, show_more) {
-    Update();
-  }
+      : TrayItemMore(owner, show_more) {}
 
   ~VpnDefaultView() override {
     ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
     // Show the VPN entry in the ash tray bubble if at least one third-party VPN
     // provider is installed.
     if (WmShell::Get()
             ->system_tray_delegate()
@@ skipping 21 matching lines @@
       ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(
           this);
     SetImage(image);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
   // ui::network_icon::AnimationObserver
   void NetworkIconChanged() override { Update(); }
 
+ protected:
+  // TrayItemMore:
+  std::unique_ptr<TrayPopupItemStyle> CreateStyle() const override {
+    std::unique_ptr<TrayPopupItemStyle> style =
+        base::MakeUnique<TrayPopupItemStyle>(
+            GetNativeTheme(),
+            TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    style->set_color_style(
+        !IsVpnEnabled()
+            ? TrayPopupItemStyle::ColorStyle::DISABLED
+            : IsVpnConnected() ? TrayPopupItemStyle::ColorStyle::ACTIVE
+                               : TrayPopupItemStyle::ColorStyle::INACTIVE);
+    return style;
+  }
+
+  void UpdateStyle() override {
+    TrayItemMore::UpdateStyle();
+    Update();
+  }
+
  private:
+  bool IsVpnEnabled() const {
+    NetworkStateHandler* handler =
+        NetworkHandler::Get()->network_state_handler();
+    return handler->FirstNetworkByType(NetworkTypePattern::VPN());
+  }
+
+  bool IsVpnConnected() const {
+    NetworkStateHandler* handler =
+        NetworkHandler::Get()->network_state_handler();
+    const NetworkState* vpn =
+        handler->FirstNetworkByType(NetworkTypePattern::VPN());
+    return IsVpnEnabled() &&
+           (vpn->IsConnectedState() || vpn->IsConnectingState());
+  }
+
   void GetNetworkStateHandlerImageAndLabel(gfx::ImageSkia* image,
                                            base::string16* label,
                                            bool* animating) {
+    // TODO(bruthig): Update the image to use the proper color. See
+    // https://crbug.com/632147.
     NetworkStateHandler* handler =
         NetworkHandler::Get()->network_state_handler();
     const NetworkState* vpn =
         handler->FirstNetworkByType(NetworkTypePattern::VPN());
     *image = ui::network_icon::GetVpnImage();
-    if (!vpn || (!vpn->IsConnectedState() && !vpn->IsConnectingState())) {
+    if (!IsVpnConnected()) {

[tdanderson, 2016/09/22 20:44:16]

Thanks for the cleanup.

       if (label) {
         *label =
             l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED);
       }
       *animating = false;
       return;
     }
     *animating = vpn->IsConnectingState();
     if (label) {
       *label = ui::network_icon::GetLabelForNetwork(
@@ skipping 64 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash