Refactor AddScrollListItem() in system menu detailed views

ash/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/system/cast/tray_cast.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 297 matching lines @@
   void SimulateViewClickedForTest(const std::string& receiver_id);
 
   // Updates the list of available receivers.
   void UpdateReceiverList(
       const std::vector<mojom::SinkAndRoutePtr>& sinks_routes);
 
  private:
   void CreateItems();
 
   void UpdateReceiverListFromCachedData();
-  views::View* AddToReceiverList(const mojom::SinkAndRoutePtr& sink_route);
 
   // TrayDetailsView:
   void HandleViewClicked(views::View* view) override;
 
   // A mapping from the receiver id to the receiver/activity data.
   std::map<std::string, ash::mojom::SinkAndRoutePtr> sinks_and_routes_;
   // A mapping from the view pointer to the associated activity id.
   std::map<views::View*, ash::mojom::CastSinkPtr> view_to_sink_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CastDetailedView);
@@ skipping 52 matching lines @@
 }
 
 void CastDetailedView::UpdateReceiverListFromCachedData() {
   // Remove all of the existing views.
   view_to_sink_map_.clear();
   scroll_content()->RemoveAllChildViews(true);
 
   // Add a view for each receiver.
   for (auto& it : sinks_and_routes_) {
     const ash::mojom::SinkAndRoutePtr& sink_route = it.second;
-    views::View* container = AddToReceiverList(sink_route);
+    const base::string16 name = base::UTF8ToUTF16(sink_route->sink->name);
+    views::View* container = AddScrollListItem(kSystemMenuCastDeviceIcon, name);
     view_to_sink_map_[container] = sink_route->sink.Clone();
   }
 
   scroll_content()->SizeToPreferredSize();
   scroller()->Layout();
 }
 
-views::View* CastDetailedView::AddToReceiverList(
-    const ash::mojom::SinkAndRoutePtr& sink_route) {
-  const gfx::ImageSkia image =
-      gfx::CreateVectorIcon(kSystemMenuCastDeviceIcon, kMenuIconColor);
-
-  HoverHighlightView* container = new HoverHighlightView(this);
-  container->AddIconAndLabel(image, base::UTF8ToUTF16(sink_route->sink->name));
-
-  scroll_content()->AddChildView(container);
-  return container;
-}
-
 void CastDetailedView::HandleViewClicked(views::View* view) {
   // Find the receiver we are going to cast to.
   auto it = view_to_sink_map_.find(view);
   if (it != view_to_sink_map_.end()) {
     Shell::Get()->cast_config()->CastToSink(it->second.Clone());
     ShellPort::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_DETAILED_CAST_VIEW_LAUNCH_CAST);
   }
 }
 
@@ skipping 107 matching lines @@
 
   return false;
 }
 
 void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
   is_mirror_casting_ = started;
   UpdatePrimaryView();
 }
 
 }  // namespace ash