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

ash/common/system/chromeos/tray_caps_lock.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/chromeos/tray_caps_lock.h"
 
 #include "ash/common/accessibility_delegate.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/system_tray_delegate.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 "base/sys_info.h"
 #include "grit/ash_resources.h"
@@ skipping 33 matching lines @@
       : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),
         text_label_(TrayPopupUtils::CreateDefaultLabel()),
         shortcut_label_(TrayPopupUtils::CreateDefaultLabel()) {
     shortcut_label_->SetEnabled(false);
 
     TriView* tri_view(TrayPopupUtils::CreateDefaultRowView());
     SetLayoutManager(new views::FillLayout);
     AddChildView(tri_view);
 
     auto image = TrayPopupUtils::CreateMainImageView();
-    if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      image->SetEnabled(enabled());
-      TrayPopupItemStyle default_view_style(
-          TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-      image->SetImage(gfx::CreateVectorIcon(kSystemMenuCapsLockIcon,
-                                            default_view_style.GetIconColor()));
-      default_view_style.SetupLabel(text_label_);
-      TrayPopupItemStyle caption_style(TrayPopupItemStyle::FontStyle::CAPTION);
-      caption_style.SetupLabel(shortcut_label_);
-      SetInkDropMode(InkDropHostView::InkDropMode::ON);
-    } else {
-      ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-      image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK)
-                          .ToImageSkia());
-    }
+    image->SetEnabled(enabled());
+    TrayPopupItemStyle default_view_style(
+        TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+    image->SetImage(gfx::CreateVectorIcon(kSystemMenuCapsLockIcon,
+                                          default_view_style.GetIconColor()));
+    default_view_style.SetupLabel(text_label_);
+
+    TrayPopupItemStyle caption_style(TrayPopupItemStyle::FontStyle::CAPTION);
+    caption_style.SetupLabel(shortcut_label_);
+
+    SetInkDropMode(InkDropHostView::InkDropMode::ON);
+
     tri_view->AddView(TriView::Container::START, image);
     tri_view->AddView(TriView::Container::CENTER, text_label_);
     tri_view->AddView(TriView::Container::END, shortcut_label_);
     tri_view->SetContainerBorder(
         TriView::Container::END,
         views::CreateEmptyBorder(0, 0, 0, kCaptionRightPadding));
   }
 
   ~CapsLockDefaultView() override {}
 
@@ skipping 46 matching lines @@
   // It indicates whether the Caps Lock is on or off.
   views::Label* text_label_;
 
   // It indicates the shortcut can be used to turn on or turn off Caps Lock.
   views::Label* shortcut_label_;
 
   DISALLOW_COPY_AND_ASSIGN(CapsLockDefaultView);
 };
 
 TrayCapsLock::TrayCapsLock(SystemTray* system_tray)
-    : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_CAPS_LOCK, UMA_CAPS_LOCK),
-      default_(NULL),
-      detailed_(NULL),
+    : TrayImageItem(system_tray, kSystemTrayCapsLockIcon, UMA_CAPS_LOCK),
+      default_(nullptr),
+      detailed_(nullptr),
       caps_lock_enabled_(CapsLockIsEnabled()),
       message_shown_(false) {
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
   if (ime && ime->GetImeKeyboard())
     ime->GetImeKeyboard()->AddObserver(this);
 }
 
 TrayCapsLock::~TrayCapsLock() {
   chromeos::input_method::InputMethodManager* ime =
@@ skipping 27 matching lines @@
     }
   }
 }
 
 bool TrayCapsLock::GetInitialVisibility() {
   return CapsLockIsEnabled();
 }
 
 views::View* TrayCapsLock::CreateDefaultView(LoginStatus status) {
   if (!caps_lock_enabled_)
-    return NULL;
-  DCHECK(default_ == NULL);
+    return nullptr;
+  DCHECK(!default_);
   default_ = new CapsLockDefaultView;
   default_->Update(caps_lock_enabled_);
   return default_;
 }
 
 views::View* TrayCapsLock::CreateDetailedView(LoginStatus status) {
-  DCHECK(detailed_ == NULL);
+  DCHECK(!detailed_);
   detailed_ = new views::View;
 
   detailed_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, kTrayPopupPaddingHorizontal, 10,
       kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
-  if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    image->SetImage(CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconSize,
-                                     kMenuIconColor));
-  } else {
-    image->SetImage(
-        bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).ToImageSkia());
-  }
-
+  image->SetImage(
+      CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconSize, kMenuIconColor));
   detailed_->AddChildView(image);
 
   const int string_id =
       WmShell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock()
           ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH
           : IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
   views::Label* label = TrayPopupUtils::CreateDefaultLabel();
   label->SetText(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
-  default_ = NULL;
+  default_ = nullptr;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
-  detailed_ = NULL;
+  detailed_ = nullptr;
 }
 
 }  // namespace ash