Refactor AddScrollListItem() in system menu detailed views

ash/system/tray_accessibility.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
 #define ASH_SYSTEM_TRAY_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
 #include "ash/accessibility_delegate.h"
-#include "ash/shell_observer.h"
 #include "ash/system/accessibility_observer.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_image_item.h"
 #include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace chromeos {
 class TrayAccessibilityTest;
 }
 
-namespace gfx {
-struct VectorIcon;
-}
-
 namespace views {
 class Button;
 class CustomButton;
 class Label;
 class View;
 }
 
 namespace ash {
-class HoverHighlightView;
 class SystemTrayItem;
 
 namespace tray {
 
 // A view for closable notification views, laid out like:
 //  -------------------
 // | icon  contents  x |
 //  ----------------v--
 // The close button will call OnClose() when clicked.
 class AccessibilityPopupView : public views::View {
  public:
   explicit AccessibilityPopupView(uint32_t enabled_state_bits);
 
   const views::Label* label_for_test() const { return label_; }
 
   void Init();
 
  private:
   views::Label* CreateLabel(uint32_t enabled_state_bits);
 
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
 };
 
 // Create the detailed view of accessibility tray.
-class AccessibilityDetailedView : public TrayDetailsView,
-                                  public ShellObserver {

[tdanderson, 2017/04/24 15:43:39]

nice catch

+class AccessibilityDetailedView : public TrayDetailsView {
  public:
   explicit AccessibilityDetailedView(SystemTrayItem* owner);
   ~AccessibilityDetailedView() override {}
 
  private:
   // TrayDetailsView:
   void HandleViewClicked(views::View* view) override;
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override;
   void CreateExtraTitleRowButtons() override;
 
   // Launches the WebUI settings in a browser and closes the system menu.
   void ShowSettings();
 
   // Launches the a11y help article in a browser and closes the system menu.
   void ShowHelp();
 
   // Add the accessibility feature list.
   void AppendAccessibilityList();
 
-  // Helper function to create entries in the detailed accessibility view.
-  HoverHighlightView* AddScrollListItem(const base::string16& text,
-                                        bool checked,
-                                        const gfx::VectorIcon& icon);
-  HoverHighlightView* AddScrollListItemWithoutIcon(const base::string16& text,
-                                                   bool checked);
-
-  void AddSubHeader(const base::string16& header_text);
-
   views::View* spoken_feedback_view_ = nullptr;
   views::View* high_contrast_view_ = nullptr;
   views::View* screen_magnifier_view_ = nullptr;
   views::View* large_cursor_view_ = nullptr;
   views::CustomButton* help_view_ = nullptr;
   views::CustomButton* settings_view_ = nullptr;
   views::View* autoclick_view_ = nullptr;
   views::View* virtual_keyboard_view_ = nullptr;
   views::View* mono_audio_view_ = nullptr;
   views::View* caret_highlight_view_ = nullptr;
@@ skipping 60 matching lines @@
   // A11y feature status on just entering the lock screen.
   bool show_a11y_menu_on_lock_screen_;
 
   friend class chromeos::TrayAccessibilityTest;
   DISALLOW_COPY_AND_ASSIGN(TrayAccessibility);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_ACCESSIBILITY_H_