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

ash/common/system/chromeos/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 35 matching lines @@
   }
 }
 
 }  // namespace
 
 class BluetoothDefaultView : public TrayItemMore {
  public:
   BluetoothDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
     if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      // The icon doesn't change in non-md.
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       SetImage(
           *bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
     }
-    Update();
   }
 
   ~BluetoothDefaultView() override {}
 
   void Update() {
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     const bool enabled = delegate->GetBluetoothEnabled();
-    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      SetImage(gfx::CreateVectorIcon(
-          enabled ? kSystemMenuBluetoothIcon : kSystemMenuBluetoothDisabledIcon,
-          kMenuIconColor));
-    }
-
     if (delegate->GetBluetoothAvailable()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       const base::string16 label = rb.GetLocalizedString(
           enabled ? IDS_ASH_STATUS_TRAY_BLUETOOTH_ENABLED
                   : IDS_ASH_STATUS_TRAY_BLUETOOTH_DISABLED);
       SetLabel(label);
       SetAccessibleName(label);
       SetVisible(true);
     } else {
       SetVisible(false);
     }
+    UpdateStyle();
+  }
+
+ protected:
+  // TrayItemMore:
+  std::unique_ptr<TrayPopupItemStyle> CreateStyle() const override {
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    std::unique_ptr<TrayPopupItemStyle> style =
+        base::MakeUnique<TrayPopupItemStyle>(
+            GetNativeTheme(),
+            TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+
+    style->set_color_style(
+        delegate->GetBluetoothEnabled()
+            ? TrayPopupItemStyle::ColorStyle::ACTIVE
+            : delegate->GetBluetoothAvailable()
+                  ? TrayPopupItemStyle::ColorStyle::INACTIVE
+                  : TrayPopupItemStyle::ColorStyle::DISABLED);
+
+    return style;
+  }
+
+  void UpdateStyle() override {
+    TrayItemMore::UpdateStyle();
+
+    if (!MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
+
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
+
+    SetImage(gfx::CreateVectorIcon(delegate->GetBluetoothEnabled()
+                                       ? kSystemMenuBluetoothIcon
+                                       : kSystemMenuBluetoothDisabledIcon,
+                                   style->GetForegroundColor()));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
 class BluetoothDetailedView : public TrayDetailsView {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login)
       : TrayDetailsView(owner),
@@ skipping 330 matching lines @@
 }
 
 views::View* TrayBluetooth::CreateTrayView(LoginStatus status) {
   return NULL;
 }
 
 views::View* TrayBluetooth::CreateDefaultView(LoginStatus status) {
   CHECK(default_ == NULL);
   default_ =
       new tray::BluetoothDefaultView(this, status != LoginStatus::LOCKED);
+  default_->Update();
   return default_;
 }
 
 views::View* TrayBluetooth::CreateDetailedView(LoginStatus status) {
   if (!WmShell::Get()->system_tray_delegate()->GetBluetoothAvailable())
     return NULL;
   WmShell::Get()->RecordUserMetricsAction(
       UMA_STATUS_AREA_DETAILED_BLUETOOTH_VIEW);
   CHECK(detailed_ == NULL);
   detailed_ = new tray::BluetoothDetailedView(this, status);
@@ skipping 20 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash