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

ash/common/system/tray_accessibility.cc

Index: ash/common/system/tray_accessibility.cc
diff --git a/ash/common/system/tray_accessibility.cc b/ash/common/system/tray_accessibility.cc
index 9e1fda577e811a2080b97da2577f6183c38fd425..e34de751e6ac51170708e49f92b8df42d20acc29 100644
--- a/ash/common/system/tray_accessibility.cc
+++ b/ash/common/system/tray_accessibility.cc
@@ -86,14 +86,9 @@ class DefaultAccessibilityView : public TrayItemMore {
  public:
   explicit DefaultAccessibilityView(SystemTrayItem* owner)
       : TrayItemMore(owner, true) {
-    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-    if (!MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      // The icon doesn't change in non-md.
-      SetImage(*bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK)
-                    .ToImageSkia());
-    }
     base::string16 label =
-        bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY);
+        ui::ResourceBundle::GetSharedInstance().GetLocalizedString(

[Evan Stade, 2017/02/16 19:53:14]

l10n_util::GetString

[tdanderson, 2017/02/17 20:32:48]

Done.

+            IDS_ASH_STATUS_TRAY_ACCESSIBILITY);
     SetLabel(label);
     SetAccessibleName(label);
     set_id(test::kAccessibilityTrayItemViewId);
@@ -105,10 +100,6 @@ class DefaultAccessibilityView : public TrayItemMore {
   // TrayItemMore:
   void UpdateStyle() override {
     TrayItemMore::UpdateStyle();
-
-    if (!UseMdMenu())
-      return;
-
     std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
     SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon,
                                    style->GetIconColor()));
@@ -349,7 +340,7 @@ void AccessibilityDetailedView::ShowHelp() {
 
 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
     : TrayImageItem(system_tray,
-                    IDR_AURA_UBER_TRAY_ACCESSIBILITY,
+                    kSystemTrayAccessibilityIcon,
                     UMA_ACCESSIBILITY),
       default_(NULL),
       detailed_popup_(NULL),