Remove unused references to NativeTheme in TrayPopupItemStyle.

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"
@@ skipping 76 matching lines @@
 bool TrayUpdate::update_required_ = false;
 // static
 mojom::UpdateSeverity TrayUpdate::severity_ = mojom::UpdateSeverity::NONE;
 // static
 bool TrayUpdate::factory_reset_required_ = false;
 
 // The "restart to update" item in the system tray menu.
 class TrayUpdate::UpdateView : public ActionableView {
  public:
   explicit UpdateView(TrayUpdate* owner)
-      : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS),
-        label_(nullptr) {
+      : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS) {
     SetLayoutManager(new views::FillLayout);
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
     AddChildView(tri_view);
     views::ImageView* image = TrayPopupUtils::CreateMainImageView();
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       image->SetImage(gfx::CreateVectorIcon(
           kSystemMenuUpdateIcon,
           IconColorForUpdateSeverity(owner->severity_, true)));
     } else {
       image->SetImage(
           bundle.GetImageNamed(DecideResource(owner->severity_, true))
               .ToImageSkia());
     }
     tri_view->AddView(TriView::Container::START, image);
 
     base::string16 label_text =
         owner->factory_reset_required_
             ? bundle.GetLocalizedString(
                   IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE)
             : bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
-    label_ = TrayPopupUtils::CreateDefaultLabel();
-    label_->SetText(label_text);
     SetAccessibleName(label_text);
-    tri_view->AddView(TriView::Container::CENTER, label_);
+    auto label = TrayPopupUtils::CreateDefaultLabel();
+    label->SetText(label_text);
+    TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    style.SetupLabel(label);
+    tri_view->AddView(TriView::Container::CENTER, label);
 
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      UpdateStyle();
       SetInkDropMode(InkDropHostView::InkDropMode::ON);
     }
   }
 
   ~UpdateView() override {}
 
  private:
-  void UpdateStyle() {
-    TrayPopupItemStyle style(GetNativeTheme(),
-                             TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-    style.SetupLabel(label_);
-  }
-
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override {
     WmShell::Get()->system_tray_controller()->RequestRestartForUpdate();
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_OS_UPDATE_DEFAULT_SELECTED);
     CloseSystemBubble();
     return true;
   }
 
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    ActionableView::OnNativeThemeChanged(theme);
-
-    if (!MaterialDesignController::IsSystemTrayMenuMaterial())
-      return;
-    UpdateStyle();
-  }
-
-  views::Label* label_;
-
   DISALLOW_COPY_AND_ASSIGN(UpdateView);
 };
 
 TrayUpdate::TrayUpdate(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_UPDATE, UMA_UPDATE) {}
 
 TrayUpdate::~TrayUpdate() {}
 
 bool TrayUpdate::GetInitialVisibility() {
   // If chrome tells ash there is an update available before this item's system
@@ skipping 14 matching lines @@
 
   // Show the icon in the tray.
   if (MaterialDesignController::UseMaterialDesignSystemIcons())
     SetIconColor(IconColorForUpdateSeverity(severity_, false));
   else
     SetImageFromResourceId(DecideResource(severity_, false));
   tray_view()->SetVisible(true);
 }
 
 }  // namespace ash