Remove unused references to NativeTheme in TrayPopupItemStyle.

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"
@@ skipping 23 matching lines @@
   explicit DefaultTracingView(SystemTrayItem* owner)
       : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
     SetLayoutManager(new views::FillLayout);
     TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
     AddChildView(tri_view);
     image_ = TrayPopupUtils::CreateMainImageView();
     tri_view->AddView(TriView::Container::START, image_);
 
-    label_ = TrayPopupUtils::CreateDefaultLabel();
-    label_->SetMultiLine(true);
-    label_->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
-    tri_view->AddView(TriView::Container::CENTER, label_);
+    auto label = TrayPopupUtils::CreateDefaultLabel();
+    label->SetMultiLine(true);
+    label->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
+    tri_view->AddView(TriView::Container::CENTER, label);
 
     if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      UpdateStyle();
+      TrayPopupItemStyle style(
+          TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+      style.SetupLabel(label);
+      image_->SetImage(

[tdanderson, 2017/02/01 23:01:52]

I think |image_| can be made a non-member as well, similar to what you're doing
for the label.

[Evan Stade, 2017/02/02 22:49:53]

Done.

+          gfx::CreateVectorIcon(kSystemMenuTracingIcon, style.GetIconColor()));
+
       SetInkDropMode(InkDropHostView::InkDropMode::ON);
     } else {
       // The icon doesn't change in non-md.
       image_->SetImage(
           bundle.GetImageNamed(IDR_AURA_UBER_TRAY_TRACING).ToImageSkia());
     }
   }
 
   ~DefaultTracingView() override {}
 
  private:
-  // Update text and image color based on the current theme of the system.
-  void UpdateStyle() {
-    TrayPopupItemStyle style(GetNativeTheme(),
-                             TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-    style.SetupLabel(label_);
-    image_->SetImage(
-        gfx::CreateVectorIcon(kSystemMenuTracingIcon, style.GetIconColor()));
-  }
-
-  // ActionableView:
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    ActionableView::OnNativeThemeChanged(theme);
-
-    if (!MaterialDesignController::IsSystemTrayMenuMaterial())
-      return;
-    UpdateStyle();
-  }
-
   bool PerformAction(const ui::Event& event) override {
     WmShell::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_TRACING_DEFAULT_SELECTED);
     WmShell::Get()->system_tray_controller()->ShowChromeSlow();
     CloseSystemBubble();
     return true;
   }
 
   views::ImageView* image_;
-  views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultTracingView);
 };
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::TrayTracing
 
 TrayTracing::TrayTracing(SystemTray* system_tray)
@@ skipping 31 matching lines @@
   default_ = NULL;
 }
 
 void TrayTracing::DestroyDetailedView() {}
 
 void TrayTracing::OnTracingModeChanged(bool value) {
   SetTrayIconVisible(value);
 }
 
 }  // namespace ash