Materialized font style for TrayItemMore type system tray rows.

ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[tdanderson, 2016/09/08 16:11:02]

Can you also add a BUG=637846 to the CL description to track the fact that this
CL lays the groundwork for theme standardization in the menu?

[bruthig, 2016/09/12 13:45:34]

Done.

 // 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 "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/gfx/vector_icons_public.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 33 matching lines @@
     }
   }
 }
 
 }  // namespace
 
 class BluetoothDefaultView : public TrayItemMore {
  public:
   BluetoothDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
+    SetStyle(base::MakeUnique<TrayPopupItemStyle>(

[tdanderson, 2016/09/08 16:11:02]

Put this behind an if (is_material) ?

[bruthig, 2016/09/12 13:45:33]

Done.

+        GetNativeTheme(),
+        TrayPopupItemStyle::FontStyle::MAIN_PANEL_SECTION_ROW));
+    // The image does not need to change for non-material.
     if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
       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();
+    const bool is_bluetooth_available = delegate->GetBluetoothAvailable();
+
+    // Toggle the style here because there is no bluetooth enabled/disabled
+    // event to observe.
+    style()->SetColorStyle(
+        enabled ? TrayPopupItemStyle::ColorStyle::ACTIVE
+                : is_bluetooth_available
+                      ? TrayPopupItemStyle::ColorStyle::INACTIVE
+                      : TrayPopupItemStyle::ColorStyle::DISABLED);
+
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       gfx::VectorIconId icon_id =
           enabled ? gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH
                   : gfx::VectorIconId::SYSTEM_MENU_BLUETOOTH_DISABLED;
-      SetImage(gfx::CreateVectorIcon(icon_id, kMenuIconColor));
+      gfx::ImageSkia image =
+          gfx::CreateVectorIcon(icon_id, style()->GetForegroundColor());
+      SetImage(image);
     }
 
-    if (delegate->GetBluetoothAvailable()) {
+    if (is_bluetooth_available) {
       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);
     }
   }
 
+  // TrayItemMore:
+  void OnTrayPopupItemStyleChanged() override {
+    Update();
+    TrayItemMore::OnTrayPopupItemStyleChanged();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
 class BluetoothDetailedView : public TrayDetailsView {
  public:
   BluetoothDetailedView(SystemTrayItem* owner, LoginStatus login)
       : TrayDetailsView(owner),
         login_(login),
         manage_devices_(nullptr),
+        throbber_(nullptr),
         toggle_bluetooth_(nullptr),
         enable_bluetooth_(nullptr) {
     CreateItems();
   }
 
   ~BluetoothDetailedView() override {
     // Stop discovering bluetooth devices when exiting BT detailed view.
     BluetoothStopDiscovering();
   }
 
@@ skipping 349 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash