Reland of Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/system/chromeos/audio/audio_detailed_view.h

Index: ash/common/system/chromeos/audio/audio_detailed_view.h
diff --git a/ash/common/system/chromeos/audio/audio_detailed_view.h b/ash/common/system/chromeos/audio/audio_detailed_view.h
index 8fa25d7f74c928641b393bb83c5794d54d10ccfd..4ae38ec78ee560eeeef4c8c4c8e5e13b365f0d14 100644
--- a/ash/common/system/chromeos/audio/audio_detailed_view.h
+++ b/ash/common/system/chromeos/audio/audio_detailed_view.h
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "ash/common/system/tray/tray_details_view.h"
-#include "ash/common/system/tray/view_click_listener.h"
 #include "base/macros.h"
 #include "chromeos/audio/audio_device.h"
 #include "ui/gfx/font.h"
@@ -22,7 +21,7 @@ class HoverHighlightView;
 
 namespace tray {
 
-class AudioDetailedView : public TrayDetailsView, public ViewClickListener {
+class AudioDetailedView : public TrayDetailsView {
  public:
   explicit AudioDetailedView(SystemTrayItem* owner);
 
@@ -37,14 +36,13 @@ class AudioDetailedView : public TrayDetailsView, public ViewClickListener {
                                         bool highlight,
                                         bool checked);
 
-  void CreateHeaderEntry();
   void CreateItems();
 
   void UpdateScrollableList();
   void UpdateAudioDevices();
 
-  // Overridden from ViewClickListener.
-  void OnViewClicked(views::View* sender) override;
+  // TrayDetailsView:
+  void HandleViewClicked(views::View* view) override;
 
   typedef std::map<views::View*, chromeos::AudioDevice> AudioDeviceMap;