Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/system/chromeos/network/network_state_list_detailed_view.h

Index: ash/common/system/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.h b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
index 0aca1bc9011ec3624ba3da34d50ee9acd1c213aa..dd62770bb4f01dc0c4031d0a2192bda55c4c8f1b 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,7 +10,6 @@
 
 #include "ash/common/login_status.h"
 #include "ash/common/system/chromeos/network/network_detailed_view.h"
-#include "ash/common/system/tray/view_click_listener.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/chromeos/network/network_list_delegate.h"
@@ -40,8 +39,6 @@ namespace tray {
 
 class NetworkStateListDetailedView
     : public NetworkDetailedView,
-      public views::ButtonListener,
-      public ViewClickListener,
       public ui::NetworkListDelegate,
       public base::SupportsWeakPtr<NetworkStateListDetailedView> {
  public:
@@ -57,15 +54,16 @@ class NetworkStateListDetailedView
   DetailedViewType GetViewType() const override;
   void Update() override;
 
- protected:
-  // Overridden from ButtonListener.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+ private:
+  class InfoBubble;
 
-  // Overridden from ViewClickListener.
   void OnViewClicked(views::View* sender) override;

[varkha, 2016/08/31 20:28:14]

Where is this overridden from?

[tdanderson, 2016/08/31 22:24:15]

Thanks for catching. It turns out that ui::NetworkListDelegate and
ViewClickListener both have pure virtual functions OnViewClicked(views::View*
sender). In the next patch set I've renamed the former to avoid confusion.

 
- private:
-  class InfoBubble;
+  // TrayDetailsView:
+  void HandleViewClicked(views::View* view) override;
+  void HandleButtonPressed(views::Button* sender,
+                           const ui::Event& event) override;
+  void CreateExtraTitleRowButtons() override;
 
   // Create UI components.
   void CreateHeaderEntry();
@@ -127,10 +125,14 @@ class NetworkStateListDetailedView
   // Track WiFi scanning state.
   bool wifi_scanning_;
 
-  // Child views.
   views::ImageButton* info_icon_;
+
+  // Not used for material design.
   TrayPopupHeaderButton* button_wifi_;
+
+  // Not used for material design.
   TrayPopupHeaderButton* button_mobile_;
+
   TrayPopupLabelButton* other_wifi_;
   TrayPopupLabelButton* turn_on_wifi_;
   TrayPopupLabelButton* other_mobile_;