[Ash MD] Remove some non-MD code 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/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 227 matching lines @@
 }
 
 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);
+    container->AddIconAndLabel(image, text);
     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);
     }
-  } else {
-    container->AddCheckableLabel(text, highlight, checked);
   }
   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()
@@ skipping 189 matching lines @@
     if (detailed_popup_)
       detailed_popup_->GetWidget()->Close();
     if (detailed_menu_)
       detailed_menu_->GetWidget()->Close();
   }
 
   previous_accessibility_state_ = accessibility_state;
 }
 
 }  // namespace ash