Remove remaining non-MD Ash accessibility UI code

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/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_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_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
@@ skipping 12 matching lines @@
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
-bool UseMdMenu() {
-  return MaterialDesignController::IsSystemTrayMenuMaterial();
-}
-
 enum AccessibilityState {
   A11Y_NONE = 0,
   A11Y_SPOKEN_FEEDBACK = 1 << 0,
   A11Y_HIGH_CONTRAST = 1 << 1,
   A11Y_SCREEN_MAGNIFIER = 1 << 2,
   A11Y_LARGE_CURSOR = 1 << 3,
   A11Y_AUTOCLICK = 1 << 4,
   A11Y_VIRTUAL_KEYBOARD = 1 << 5,
   A11Y_BRAILLE_DISPLAY_CONNECTED = 1 << 6,
 };
@@ skipping 97 matching lines @@
       autoclick_view_(nullptr),
       virtual_keyboard_view_(nullptr),
       spoken_feedback_enabled_(false),
       high_contrast_enabled_(false),
       screen_magnifier_enabled_(false),
       large_cursor_enabled_(false),
       autoclick_enabled_(false),
       virtual_keyboard_enabled_(false),
       login_(login) {
   Reset();
-
   AppendAccessibilityList();
-
-  if (!UseMdMenu())
-    AppendHelpEntries();
-
   CreateTitleRow(IDS_ASH_STATUS_TRAY_ACCESSIBILITY_TITLE);
-
   Layout();
 }
 
 void AccessibilityDetailedView::AppendAccessibilityList() {
   CreateScrollableList();
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
   AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
   spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
   spoken_feedback_view_ =
@@ skipping 35 matching lines @@
   }
 
   virtual_keyboard_enabled_ = delegate->IsVirtualKeyboardEnabled();
   virtual_keyboard_view_ =
       AddScrollListItem(bundle.GetLocalizedString(
                             IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD),
                         virtual_keyboard_enabled_, virtual_keyboard_enabled_,
                         kSystemMenuKeyboardIcon);
 }
 
-void AccessibilityDetailedView::AppendHelpEntries() {
-  DCHECK(!UseMdMenu());
-}
-
 HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
     const base::string16& text,
     bool highlight,
     bool checked,
     const gfx::VectorIcon& icon) {
   HoverHighlightView* container = new HoverHighlightView(this);
-  if (UseMdMenu()) {
-    gfx::ImageSkia image = CreateVectorIcon(icon, kMenuIconColor);
-    const int padding = (kMenuButtonSize - image.width()) / 2;
-    container->AddIconAndLabelCustomSize(
-        image, text, highlight,
-        image.width() + kMenuSeparatorVerticalPadding * 2, padding, padding);
-    if (checked) {
-      gfx::ImageSkia check_mark = CreateVectorIcon(
-          gfx::VectorIconId::CHECK_CIRCLE, gfx::kGoogleGreen700);
-      container->AddRightIcon(check_mark, check_mark.width());
-      container->SetRightViewVisible(true);
-      container->SetAccessiblityState(
-          HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
-    } else {
-      container->SetAccessiblityState(
-          HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
-    }
+  gfx::ImageSkia image = CreateVectorIcon(icon, kMenuIconColor);
+  const int padding = (kMenuButtonSize - image.width()) / 2;
+  container->AddIconAndLabelCustomSize(
+      image, text, highlight, image.width() + kMenuSeparatorVerticalPadding * 2,
+      padding, padding);
+
+  if (checked) {
+    gfx::ImageSkia check_mark =
+        CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE, gfx::kGoogleGreen700);
+    container->AddRightIcon(check_mark, check_mark.width());
+    container->SetRightViewVisible(true);
+    container->SetAccessiblityState(
+        HoverHighlightView::AccessibilityState::CHECKED_CHECKBOX);
   } else {
-    container->AddCheckableLabel(text, highlight, checked);
+    container->SetAccessiblityState(
+        HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);
   }
+
   scroll_content()->AddChildView(container);
   return container;
 }
 
 void AccessibilityDetailedView::HandleViewClicked(views::View* view) {
   AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
   UserMetricsAction user_action;
   if (view == spoken_feedback_view_) {
     user_action = delegate->IsSpokenFeedbackEnabled()
                       ? ash::UMA_STATUS_AREA_DISABLE_SPOKEN_FEEDBACK
@@ skipping 32 matching lines @@
 
 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender,
                                                     const ui::Event& event) {
   if (sender == help_view_)
     ShowHelp();
   else if (sender == settings_view_)
     ShowSettings();
 }
 
 void AccessibilityDetailedView::CreateExtraTitleRowButtons() {
-  if (UseMdMenu()) {
-    DCHECK(!help_view_);
-    DCHECK(!settings_view_);
+  DCHECK(!help_view_);
+  DCHECK(!settings_view_);
 
-    tri_view()->SetContainerVisible(TriView::Container::END, true);
+  tri_view()->SetContainerVisible(TriView::Container::END, true);
 
-    help_view_ = CreateHelpButton(login_);
-    settings_view_ = CreateSettingsButton(
-        login_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SETTINGS);
-    tri_view()->AddView(TriView::Container::END, help_view_);
-    tri_view()->AddView(TriView::Container::END, settings_view_);
-  }
+  help_view_ = CreateHelpButton(login_);
+  settings_view_ =
+      CreateSettingsButton(login_, IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SETTINGS);
+  tri_view()->AddView(TriView::Container::END, help_view_);
+  tri_view()->AddView(TriView::Container::END, settings_view_);
 }
 
 void AccessibilityDetailedView::ShowSettings() {
   if (TrayPopupUtils::CanOpenWebUISettings(login_)) {
     WmShell::Get()->system_tray_controller()->ShowAccessibilitySettings();
     owner()->system_tray()->CloseSystemBubble();
   }
 }
 
 void AccessibilityDetailedView::ShowHelp() {
@@ skipping 125 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash