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

ash/common/system/chromeos/tray_tracing.cc

 // Copyright 2013 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/tray_tracing.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_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/tray_constants.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/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"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 namespace tray {
 
 class DefaultTracingView : public ActionableView {
  public:
   DefaultTracingView() {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal, 0,
                                           kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     image_ =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
-    if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      // TODO(tdanderson): Update the icon used for tracing or remove it from
-      // the system menu. See crbug.com/625691.
-      image_->SetImage(CreateVectorIcon(gfx::VectorIconId::CODE, kMenuIconSize,
-                                        kMenuIconColor));
-    } else {
+    if (!MaterialDesignController::UseMaterialDesignSystemIcons()) {
+      // The icon doesn't change in non-md.
       image_->SetImage(
           bundle.GetImageNamed(IDR_AURA_UBER_TRAY_TRACING).ToImageSkia());
     }
     AddChildView(image_);
 
     label_ = new views::Label();
     label_->SetMultiLine(true);
     label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
     AddChildView(label_);
   }
 
   ~DefaultTracingView() override {}
 
  private:
-  // Overridden from ActionableView.
+  // ActionableView:
+  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
+    ActionableView::OnNativeThemeChanged(theme);
+
+    if (!MaterialDesignController::IsSystemTrayMenuMaterial())
+      return;
+
+    TrayPopupItemStyle style(GetNativeTheme(),
+                             TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    style.SetupLabel(label_);
+
+    // TODO(tdanderson): Update the icon used for tracing or remove it from
+    // the system menu. See crbug.com/625691.
+    image_->SetImage(CreateVectorIcon(gfx::VectorIconId::CODE, kMenuIconSize,
+                                      style.GetForegroundColor()));
+  }
+
   bool PerformAction(const ui::Event& event) override {
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_TRACING_DEFAULT_SELECTED);
     WmShell::Get()->system_tray_delegate()->ShowChromeSlow();
     return true;
   }
 
   views::ImageView* image_;
   views::Label* label_;
 
@@ skipping 40 matching lines @@
   default_ = NULL;
 }
 
 void TrayTracing::DestroyDetailedView() {}
 
 void TrayTracing::OnTracingModeChanged(bool value) {
   SetTrayIconVisible(value);
 }
 
 }  // namespace ash