Reland of Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/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_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_
 #define ASH_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/system/accessibility_observer.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_image_item.h"
 #include "ash/common/system/tray/tray_notification_view.h"
-#include "ash/common/system/tray/view_click_listener.h"
 #include "base/macros.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 
 namespace chromeos {
 class TrayAccessibilityTest;
 }
 
 namespace views {
 class Button;
@@ skipping 16 matching lines @@
 
  private:
   views::Label* CreateLabel(uint32_t enabled_state_bits);
 
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityPopupView);
 };
 
 class AccessibilityDetailedView : public TrayDetailsView,
-                                  public ViewClickListener,
-                                  public views::ButtonListener,
                                   public ShellObserver {
  public:
   AccessibilityDetailedView(SystemTrayItem* owner, LoginStatus login);
   ~AccessibilityDetailedView() override {}
 
  private:
+  // TrayDetailsView:
+  void HandleViewClicked(views::View* view) override;
+  void HandleButtonPressed(views::Button* sender,
+                           const ui::Event& event) override;
+
   // Add the accessibility feature list.
   void AppendAccessibilityList();
 
   // Add help entries.
   void AppendHelpEntries();
 
   HoverHighlightView* AddScrollListItem(const base::string16& text,
                                         bool highlight,
                                         bool checked);
-  // Overridden from ViewClickListener.
-  void OnViewClicked(views::View* sender) override;
-  // Overridden from ButtonListener.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   views::View* spoken_feedback_view_;
   views::View* high_contrast_view_;
   views::View* screen_magnifier_view_;
   views::View* large_cursor_view_;
   views::View* help_view_;
   views::View* settings_view_;
   views::View* autoclick_view_;
   views::View* virtual_keyboard_view_;
 
@@ skipping 49 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_COMMON_SYSTEM_TRAY_ACCESSIBILITY_H_