Reland of 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..ce40930468e2b78a55a287cf089bc5a64ff21df0 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,16 +54,15 @@ class NetworkStateListDetailedView
   DetailedViewType GetViewType() const override;
   void Update() override;
 
- protected:
-  // Overridden from ButtonListener.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
-  // Overridden from ViewClickListener.
-  void OnViewClicked(views::View* sender) override;
-
  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();
   void CreateNetworkExtra();
@@ -116,6 +112,7 @@ class NetworkStateListDetailedView
   void UpdateViewForNetwork(views::View* view,
                             const ui::NetworkInfo& info) override;
   views::Label* CreateInfoLabel() override;
+  void OnNetworkEntryClicked(views::View* sender) override;
   void RelayoutScrollList() override;
 
   // Type of list (all networks or vpn)
@@ -127,10 +124,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_;