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

ash/common/system/update/tray_update.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/update/tray_update.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.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 "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.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 49 matching lines @@
       return for_menu ? gfx::kGoogleRed700 : gfx::kGoogleRed300;
     default:
       NOTREACHED();
       break;
   }
   return default_color;
 }
 
 class UpdateView : public ActionableView {
  public:
-  explicit UpdateView(const UpdateInfo& info) {
+  explicit UpdateView(const UpdateInfo& info) : label_(nullptr) {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal, 0,
                                           kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     views::ImageView* image =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       image->SetImage(gfx::CreateVectorIcon(
           kSystemMenuUpdateIcon,
           IconColorForUpdateSeverity(info.severity, true)));
     } else {
       image->SetImage(bundle.GetImageNamed(DecideResource(info.severity, true))
                           .ToImageSkia());
     }
     AddChildView(image);
 
-    base::string16 label =
+    base::string16 label_text =
         info.factory_reset_required
             ? bundle.GetLocalizedString(
                   IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE)
             : bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
-    AddChildView(new views::Label(label));
-    SetAccessibleName(label);
+    label_ = new views::Label(label_text);
+    AddChildView(label_);
+    SetAccessibleName(label_text);
   }
 
   ~UpdateView() override {}
 
  private:
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override {
     WmShell::Get()->system_tray_delegate()->RequestRestartForUpdate();
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_OS_UPDATE_DEFAULT_SELECTED);
     return true;
   }
 
+  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_);
+  }
+
+  views::Label* label_;
+
   DISALLOW_COPY_AND_ASSIGN(UpdateView);
 };
 
 }  // namespace
 
 TrayUpdate::TrayUpdate(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_UPDATE, UMA_UPDATE) {
   WmShell::Get()->system_tray_notifier()->AddUpdateObserver(this);
 }
 
@@ skipping 15 matching lines @@
 
 void TrayUpdate::OnUpdateRecommended(const UpdateInfo& info) {
   if (MaterialDesignController::UseMaterialDesignSystemIcons())
     SetIconColor(IconColorForUpdateSeverity(info.severity, false));
   else
     SetImageFromResourceId(DecideResource(info.severity, false));
   tray_view()->SetVisible(true);
 }
 
 }  // namespace ash