[Ash] Remove pre-MD code paths from HoverHighlightView

ash/common/system/tray_accessibility.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/tray_accessibility.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
@@ skipping 129 matching lines @@
     : label_(CreateLabel(enabled_state_bits)) {}
 
 void AccessibilityPopupView::Init() {
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::ImageView* close_button = new views::ImageView();
   close_button->SetImage(
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));

[Evan Stade, 2017/04/05 13:56:43]

add TODO or file bug to fix this?

[tdanderson, 2017/04/05 14:24:39]

AccessibilityPopupView will be ripped out as part of crbug.com/685845

   close_button->SetHorizontalAlignment(views::ImageView::CENTER);
   close_button->SetVerticalAlignment(views::ImageView::CENTER);
 
   views::ImageView* icon = new views::ImageView;
   icon->SetImage(
       gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon, kMenuIconColor));
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
 
   columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
@@ skipping 57 matching lines @@
     : TrayDetailsView(owner),
       login_(login) {
   Reset();
   AppendAccessibilityList();
   CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   AccessibilityDelegate* delegate =
       Shell::GetInstance()->accessibility_delegate();
   spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
-  spoken_feedback_view_ =
-      AddScrollListItem(bundle.GetLocalizedString(
-                            IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
-                        spoken_feedback_enabled_, spoken_feedback_enabled_,
-                        kSystemMenuAccessibilityChromevoxIcon);
+  spoken_feedback_view_ = AddScrollListItem(
+      l10n_util::GetStringUTF16(
+          IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SPOKEN_FEEDBACK),
+      spoken_feedback_enabled_, kSystemMenuAccessibilityChromevoxIcon);
 
   high_contrast_enabled_ = delegate->IsHighContrastEnabled();
   high_contrast_view_ = AddScrollListItem(
-      bundle.GetLocalizedString(
+      l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGH_CONTRAST_MODE),
-      high_contrast_enabled_, high_contrast_enabled_,
-      kSystemMenuAccessibilityContrastIcon);
+      high_contrast_enabled_, kSystemMenuAccessibilityContrastIcon);
   screen_magnifier_enabled_ = delegate->IsMagnifierEnabled();
-  screen_magnifier_view_ =
-      AddScrollListItem(bundle.GetLocalizedString(
-                            IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
-                        screen_magnifier_enabled_, screen_magnifier_enabled_,
-                        kSystemMenuAccessibilityScreenMagnifierIcon);
+  screen_magnifier_view_ = AddScrollListItem(
+      l10n_util::GetStringUTF16(
+          IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SCREEN_MAGNIFIER),
+      screen_magnifier_enabled_, kSystemMenuAccessibilityScreenMagnifierIcon);
 
   autoclick_enabled_ = delegate->IsAutoclickEnabled();
   autoclick_view_ = AddScrollListItem(
-      bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_AUTOCLICK),
-      autoclick_enabled_, autoclick_enabled_,
-      kSystemMenuAccessibilityAutoClickIcon);
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_AUTOCLICK),
+      autoclick_enabled_, kSystemMenuAccessibilityAutoClickIcon);
 
   virtual_keyboard_enabled_ = delegate->IsVirtualKeyboardEnabled();
   virtual_keyboard_view_ =
-      AddScrollListItem(bundle.GetLocalizedString(
+      AddScrollListItem(l10n_util::GetStringUTF16(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
-                        virtual_keyboard_enabled_, virtual_keyboard_enabled_,
-                        kSystemMenuKeyboardIcon);
+                        virtual_keyboard_enabled_, kSystemMenuKeyboardIcon);
 
   scroll_content()->AddChildView(
       TrayPopupUtils::CreateListSubHeaderSeparator());
 
   AddSubHeader(l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_ACCESSIBILITY_ADDITIONAL_SETTINGS));
 
   large_cursor_enabled_ = delegate->IsLargeCursorEnabled();
   large_cursor_view_ = AddScrollListItemWithoutIcon(
-      bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_LARGE_CURSOR),
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_LARGE_CURSOR),
       large_cursor_enabled_);
 
   mono_audio_enabled_ = delegate->IsMonoAudioEnabled();
   mono_audio_view_ = AddScrollListItemWithoutIcon(
-      bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_MONO_AUDIO),
+      l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_MONO_AUDIO),
       mono_audio_enabled_);
 
   caret_highlight_enabled_ = delegate->IsCaretHighlightEnabled();
   caret_highlight_view_ = AddScrollListItemWithoutIcon(
-      bundle.GetLocalizedString(
+      l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_CARET_HIGHLIGHT),
       caret_highlight_enabled_);
 
   highlight_mouse_cursor_enabled_ = delegate->IsCursorHighlightEnabled();
   highlight_mouse_cursor_view_ = AddScrollListItemWithoutIcon(
-      bundle.GetLocalizedString(
+      l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGHLIGHT_MOUSE_CURSOR),
       highlight_mouse_cursor_enabled_);
 
   // Focus highlighting can't be on when spoken feedback is on because
   // ChromeVox does its own focus highlighting.
   if (!spoken_feedback_enabled_) {
     highlight_keyboard_focus_enabled_ = delegate->IsFocusHighlightEnabled();
     highlight_keyboard_focus_view_ = AddScrollListItemWithoutIcon(
-        bundle.GetLocalizedString(
+        l10n_util::GetStringUTF16(
             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_HIGHLIGHT_KEYBOARD_FOCUS),
         highlight_keyboard_focus_enabled_);
   }
 }
 
 HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
     const base::string16& text,
-    bool highlight,
     bool checked,
     const gfx::VectorIcon& icon) {
   HoverHighlightView* container = new HoverHighlightView(this);
   gfx::ImageSkia image = CreateVectorIcon(icon, kMenuIconColor);
-  const int padding = (kMenuButtonSize - image.width()) / 2;
-  container->AddIconAndLabelCustomSize(
-      image, text, highlight, image.width() + kMenuSeparatorVerticalPadding * 2,
-      padding, padding);
-
+  container->AddIconAndLabel(image, text);
   UpdateCheckMark(container, checked);
-
   scroll_content()->AddChildView(container);
   return container;
 }
 
 HoverHighlightView* AccessibilityDetailedView::AddScrollListItemWithoutIcon(
     const base::string16& text,
     bool checked) {
   HoverHighlightView* container = new HoverHighlightView(this);
-  container->AddLabelRowMd(text);
+  container->AddLabelRow(text);
 
   UpdateCheckMark(container, checked);
 
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void AccessibilityDetailedView::AddSubHeader(
     const base::string16& header_text) {
   TriView* header = TrayPopupUtils::CreateSubHeaderRowView();
@@ skipping 229 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash