Revert of Make TrayDetailsView a ViewClickListener and ButtonListener

ash/common/system/cast/tray_cast.cc

 // Copyright 2015 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.
 
 #include "ash/common/system/cast/tray_cast.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
+#include "ash/common/system/tray/view_click_listener.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
@@ skipping 344 matching lines @@
   views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
                                              ? views::BoxLayout::kHorizontal
                                              : views::BoxLayout::kVertical;
   SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
   Layout();
 }
 
 // This view displays a list of cast receivers that can be clicked on and casted
 // to. It is activated by clicking on the chevron inside of
 // |CastSelectDefaultView|.
-class CastDetailedView : public TrayDetailsView {
+class CastDetailedView : public TrayDetailsView, public ViewClickListener {
  public:
   CastDetailedView(SystemTrayItem* owner,
                    LoginStatus login,
                    const CastConfigDelegate::ReceiversAndActivities&
                        receivers_and_activities);
   ~CastDetailedView() override;
 
   // Makes the detail view think the view associated with the given receiver_id
   // was clicked. This will start a cast.
   void SimulateViewClickedForTest(const std::string& receiver_id);
 
   // Updates the list of available receivers.
   void UpdateReceiverList(const CastConfigDelegate::ReceiversAndActivities&
                               new_receivers_and_activities);
 
  private:
   void CreateItems();
 
   void UpdateReceiverListFromCachedData();
   views::View* AddToReceiverList(
       const CastConfigDelegate::ReceiverAndActivity& receiverActivity);
 
   void AppendSettingsEntries();
+  void AppendHeaderEntry();
 
-  // TrayDetailsView:
-  void HandleViewClicked(views::View* view) override;
+  // Overridden from ViewClickListener.
+  void OnViewClicked(views::View* sender) override;
 
   LoginStatus login_;
   views::View* options_ = nullptr;
   // A mapping from the receiver id to the receiver/activity data.
   std::map<std::string, CastConfigDelegate::ReceiverAndActivity>
       receivers_and_activities_;
   // A mapping from the view pointer to the associated activity id.
   std::map<views::View*, std::string> receiver_activity_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CastDetailedView);
 };
 
 CastDetailedView::CastDetailedView(
     SystemTrayItem* owner,
     LoginStatus login,
     const CastConfigDelegate::ReceiversAndActivities& receivers_and_activities)
     : TrayDetailsView(owner), login_(login) {
   CreateItems();
   UpdateReceiverList(receivers_and_activities);
 }
 
 CastDetailedView::~CastDetailedView() {}
 
 void CastDetailedView::SimulateViewClickedForTest(
     const std::string& receiver_id) {
   for (auto& it : receiver_activity_map_) {
     if (it.second == receiver_id) {
-      HandleViewClicked(it.first);
+      OnViewClicked(it.first);
       break;
     }
   }
 }
 
 void CastDetailedView::CreateItems() {
   CreateScrollableList();
   if (GetCastConfigDelegate()->HasOptions())
     AppendSettingsEntries();
-  CreateTitleRow(IDS_ASH_STATUS_TRAY_CAST);
+  AppendHeaderEntry();
 }
 
 void CastDetailedView::UpdateReceiverList(
     const CastConfigDelegate::ReceiversAndActivities&
         new_receivers_and_activities) {
   // Add/update existing.
   for (auto i = new_receivers_and_activities.begin();
        i != new_receivers_and_activities.end(); ++i) {
     receivers_and_activities_[i->receiver.id] = *i;
   }
@@ skipping 62 matching lines @@
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   HoverHighlightView* container = new HoverHighlightView(this);
   container->AddLabel(rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAST_OPTIONS),
                       gfx::ALIGN_LEFT, false /* highlight */);
 
   AddChildView(container);
   options_ = container;
 }
 
-void CastDetailedView::HandleViewClicked(views::View* view) {
-  if (view == options_) {
-    GetCastConfigDelegate()->LaunchCastOptions();
-    return;
-  }
+void CastDetailedView::AppendHeaderEntry() {
+  CreateSpecialRow(IDS_ASH_STATUS_TRAY_CAST, this);
+}
 
-  // Find the receiver we are going to cast to.
-  auto it = receiver_activity_map_.find(view);
-  if (it != receiver_activity_map_.end()) {
-    GetCastConfigDelegate()->CastToReceiver(it->second);
-    WmShell::Get()->RecordUserMetricsAction(
-        UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
+void CastDetailedView::OnViewClicked(views::View* sender) {
+  CastConfigDelegate* cast_config_delegate = GetCastConfigDelegate();
+
+  if (sender == footer()->content()) {
+    TransitionToDefaultView();
+  } else if (sender == options_) {
+    cast_config_delegate->LaunchCastOptions();
+  } else {
+    // Find the receiver we are going to cast to
+    auto it = receiver_activity_map_.find(sender);
+    if (it != receiver_activity_map_.end()) {
+      cast_config_delegate->CastToReceiver(it->second);
+      WmShell::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
+    }
   }
 }
 
 }  // namespace tray
 
 TrayCast::TrayCast(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_CAST) {
   WmShell::Get()->AddShellObserver(this);
 }
 
@@ skipping 122 matching lines @@
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_)
     tray_->UpdateAlignment(alignment);
 }
 
 }  // namespace ash