[Ash MD] Remove pre-MD code from TrayImageItem and subclasses

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_controller.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/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.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/base/l10n/l10n_util.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"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 namespace tray {
 
 class DefaultTracingView : public ActionableView {
  public:
   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);
+
     auto image = TrayPopupUtils::CreateMainImageView();
     tri_view->AddView(TriView::Container::START, image);
 
     auto label = TrayPopupUtils::CreateDefaultLabel();
     label->SetMultiLine(true);
-    label->SetText(bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_TRACING));
+    label->SetText(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_TRACING));
     tri_view->AddView(TriView::Container::CENTER, label);
 
-    if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      TrayPopupItemStyle style(
-          TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-      style.SetupLabel(label);
-      image->SetImage(
-          gfx::CreateVectorIcon(kSystemMenuTracingIcon, style.GetIconColor()));
+    TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    style.SetupLabel(label);
+    image->SetImage(
+        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());
-    }
+    SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~DefaultTracingView() override {}
 
  private:
   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;
   }
 
   DISALLOW_COPY_AND_ASSIGN(DefaultTracingView);
 };
 
 }  // namespace tray
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::TrayTracing
 
 TrayTracing::TrayTracing(SystemTray* system_tray)
-    : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_TRACING, UMA_TRACING),
+    : TrayImageItem(system_tray, kSystemTrayTracingIcon, UMA_TRACING),
       default_(nullptr) {
   DCHECK(system_tray);
   WmShell::Get()->system_tray_notifier()->AddTracingObserver(this);
 }
 
 TrayTracing::~TrayTracing() {
   WmShell::Get()->system_tray_notifier()->RemoveTracingObserver(this);
 }
 
 void TrayTracing::SetTrayIconVisible(bool visible) {
@@ skipping 20 matching lines @@
   default_ = NULL;
 }
 
 void TrayTracing::DestroyDetailedView() {}
 
 void TrayTracing::OnTracingModeChanged(bool value) {
   SetTrayIconVisible(value);
 }
 
 }  // namespace ash