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

ash/system/chromeos/rotation/tray_rotation_lock.cc

 // Copyright 2014 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/system/chromeos/rotation/tray_rotation_lock.h"
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
-#include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 namespace ash {
 
 namespace tray {
 
 // Extends TrayItemMore, however does not make use of the chevron, nor of the
 // DetailedView. This was chosen over ActionableView in order to reuse the
 // layout and styling of labels and images. This allows RotationLockDefaultView
@@ skipping 51 matching lines @@
 }
 
 void RotationLockDefaultView::UpdateStyle() {
   TrayItemMore::UpdateStyle();
   UpdateImage();
 }
 
 void RotationLockDefaultView::UpdateImage() {
   const bool rotation_locked =
       Shell::GetInstance()->screen_orientation_controller()->rotation_locked();
-  if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
-    SetImage(gfx::CreateVectorIcon(rotation_locked
-                                       ? kSystemMenuRotationLockLockedIcon
-                                       : kSystemMenuRotationLockAutoIcon,
-                                   kMenuIconSize, style->GetIconColor()));
-  } else {
-    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-    const int resource_id = rotation_locked
-                                ? IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED_DARK
-                                : IDR_AURA_UBER_TRAY_AUTO_ROTATION_DARK;
-    SetImage(*bundle.GetImageNamed(resource_id).ToImageSkia());
-  }
-
+  std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
+  SetImage(gfx::CreateVectorIcon(rotation_locked
+                                     ? kSystemMenuRotationLockLockedIcon
+                                     : kSystemMenuRotationLockAutoIcon,
+                                 kMenuIconSize, style->GetIconColor()));
   base::string16 label = l10n_util::GetStringUTF16(
       rotation_locked ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED
                       : IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO);
   SetLabel(label);
   SetAccessibleName(label);
 }
 
 }  // namespace tray
 
 TrayRotationLock::TrayRotationLock(SystemTray* system_tray)
     : TrayImageItem(system_tray,
-                    IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED,
+                    kSystemTrayRotationLockLockedIcon,
                     UMA_ROTATION_LOCK),
       observing_rotation_(false),
       observing_shell_(true) {
   WmShell::Get()->AddShellObserver(this);
 }
 
 TrayRotationLock::~TrayRotationLock() {
   StopObservingShell();
 }
 
 void TrayRotationLock::OnRotationLockChanged(bool rotation_locked) {
   tray_view()->SetVisible(ShouldBeVisible());
 }
 
 views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
   if (OnPrimaryDisplay())
     return new tray::RotationLockDefaultView(this);
-  return NULL;
+  return nullptr;
 }
 
 void TrayRotationLock::OnMaximizeModeStarted() {
   tray_view()->SetVisible(
       Shell::GetInstance()->screen_orientation_controller()->rotation_locked());
   Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
   observing_rotation_ = true;
 }
 
 void TrayRotationLock::OnMaximizeModeEnded() {
@@ skipping 39 matching lines @@
 }
 
 void TrayRotationLock::StopObservingShell() {
   if (!observing_shell_)
     return;
   WmShell::Get()->RemoveShellObserver(this);
   observing_shell_ = false;
 }
 
 }  // namespace ash