Materialized font style for TrayItemMore type system tray rows.

ash/common/system/tray/tray_item_more.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/tray/tray_item_more.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "ui/accessibility/ax_view_state.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/native_theme/native_theme.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 
 TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)
     : owner_(owner),
       show_more_(show_more),
-      icon_(NULL),
-      label_(NULL),
-      more_(NULL) {
+      icon_(nullptr),
+      label_(nullptr),
+      more_(nullptr) {
+  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    style_.reset(new TrayPopupItemStyle(GetNativeTheme(),
+                                        TrayPopupItemStyle::FontStyle::TITLE));
+    style_->AddObserver(this);
+  }
+
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                         kTrayPopupPaddingHorizontal, 0,
                                         kTrayPopupPaddingBetweenItems));
 
   icon_ = new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
   AddChildView(icon_);
 
   label_ = new views::Label;
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(label_);
 
-  if (show_more) {
-    more_ = new views::ImageView;
-    more_->EnableCanvasFlippingForRTLUI(true);
-    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      more_->SetImage(
-          gfx::CreateVectorIcon(kSystemMenuArrowRightIcon, kMenuIconColor));
-    } else {
-      more_->SetImage(ui::ResourceBundle::GetSharedInstance()
-                          .GetImageNamed(IDR_AURA_UBER_TRAY_MORE)
-                          .ToImageSkia());
-    }
-    AddChildView(more_);
-  }
+  UpdateContent();

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

If I'm not mistaken, this call to UpdateContent() invokes the function at line
83 (since it's in the constructor) whereas the call on line 80 will invoke the
subclass-specific UpdateContent() overrides, which is ill-advised. It seems like
you should:

* Make TrayItemMore::UpdateContent() private, non-virtual, and call it something
else, say UpdateTrayItemMoreContent() for the sake of argument.

* Call UpdateTrayItemMoreContent() on line 48 instead of UpdateContent().

* I think you want line 80 to stay as-is.

* Keep TrayItemMore::UpdateContent() as virtual and protected, but it will just
call through to UTIMC().

 }
 
-TrayItemMore::~TrayItemMore() {}
+TrayItemMore::~TrayItemMore() {
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    style_->RemoveObserver(this);
+}
 
 void TrayItemMore::SetLabel(const base::string16& label) {
   label_->SetText(label);
   Layout();
   SchedulePaint();
 }
 
 void TrayItemMore::SetImage(const gfx::ImageSkia& image_skia) {
   icon_->SetImage(image_skia);
   SchedulePaint();
 }
 
 void TrayItemMore::SetAccessibleName(const base::string16& name) {
   accessible_name_ = name;
 }
 
-void TrayItemMore::ReplaceIcon(views::View* view) {
-  delete icon_;
-  icon_ = NULL;
-  AddChildViewAt(view, 0);
+void TrayItemMore::SetStyle(std::unique_ptr<TrayPopupItemStyle> style) {
+  DCHECK(MaterialDesignController::IsSystemTrayMenuMaterial() && style);
+  style_ = std::move(style);
+  style_->AddObserver(this);
+  OnTrayPopupItemStyleUpdated();
+}
+
+void TrayItemMore::OnTrayPopupItemStyleUpdated() {
+  SetEnabled(style_->color_style() != TrayPopupItemStyle::ColorStyle::DISABLED);
+  UpdateContent();
+}
+
+void TrayItemMore::UpdateContent() {
+  if (more_) {
+    delete more_;
+    more_ = nullptr;
+  }
+
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    style()->SetupLabel(label_);
+
+  if (show_more_) {
+    more_ = new views::ImageView;
+    more_->EnableCanvasFlippingForRTLUI(true);
+
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      more_->SetImage(gfx::CreateVectorIcon(kSystemMenuArrowRightIcon,
+                                            style()->GetForegroundColor()));
+    } else {
+      more_->SetImage(ui::ResourceBundle::GetSharedInstance()
+                          .GetImageNamed(IDR_AURA_UBER_TRAY_MORE)
+                          .ToImageSkia());
+    }
+    AddChildView(more_);
+  }
 }
 
 bool TrayItemMore::PerformAction(const ui::Event& event) {
   if (!show_more_)
     return false;
 
   owner()->TransitionDetailedView();
   return true;
 }
 
@@ skipping 19 matching lines @@
     label_->SetBoundsRect(bounds);
   }
 }
 
 void TrayItemMore::GetAccessibleState(ui::AXViewState* state) {
   ActionableView::GetAccessibleState(state);
   if (!accessible_name_.empty())
     state->name = accessible_name_;
 }
 
+void TrayItemMore::OnThemeChanged() {
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    style_->SetTheme(GetNativeTheme());
+}
+
 }  // namespace ash