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.
 // 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/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) {
-    if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      style()->SetFontStyle(
+          TrayPopupItemStyle::FontStyle::MAIN_PANEL_SECTION_ROW);
+    } else {
+      // The image does not need to change for non-material.
       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();

[tdanderson, 2016/09/12 18:51:47]

I don't think you need to give this a name since you're only using it once.
Ditto for line 112.

[bruthig, 2016/09/15 18:56:29]

Done.

+
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      SetImage(gfx::CreateVectorIcon(
+      // 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);
+      // UpdateContent() should be called due to the style change above.

[tdanderson, 2016/09/12 18:51:47]

Did you mean to actually call UpdateContent() here? It seems that you should be,
otherwise the icon doesn't get set.

[bruthig, 2016/09/15 18:56:29]

It will be called via TrayItemMore::OnTrayPopupItemStyleUpdated() as per the
comment.

[tdanderson, 2016/09/15 19:49:33]

I read the 'should' in this comment as "[you the developer] should make sure you
call UpdateContent() at some point because the style has changed." I suggest
changing 'should' to 'will', optionally 'will be called by TIM::OTPISU()'.

+    } else {
+      UpdateContent();
+    }
+  }
+
+ protected:
+  void UpdateContent() override {

[tdanderson, 2016/09/12 18:51:47]

private seems like a better choice than protected since BluetoothDefaultView has
no derived classes.

[bruthig, 2016/09/15 18:56:29]

Done.

+    TrayItemMore::UpdateContent();
+
+    SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
+    const bool enabled = delegate->GetBluetoothEnabled();
+    const bool is_bluetooth_available = delegate->GetBluetoothAvailable();
+
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      gfx::ImageSkia image = gfx::CreateVectorIcon(
           enabled ? kSystemMenuBluetoothIcon : kSystemMenuBluetoothDisabledIcon,
-          kMenuIconColor));
+          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);
     }
@@ skipping 372 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash