Refactor AddScrollListItem() in system menu detailed views

ash/system/tray/tray_details_view.cc

 // Copyright (c) 2012 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/tray/tray_details_view.h"
 
 #include "ash/ash_view_ids.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "base/containers/adapters.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skia_paint_util.h"
+#include "ui/gfx/vector_icon_types.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace ash {
 namespace {
@@ skipping 261 matching lines @@
   // TODO(varkha): Make the sticky rows work with EnableViewPortLayer().
   scroller_->SetPaintToLayer();
   scroller_->set_background(views::Background::CreateThemedSolidBackground(
       scroller_, ui::NativeTheme::kColorId_BubbleBackground));
   scroller_->layer()->SetMasksToBounds(true);
 
   AddChildView(scroller_);
   box_layout_->SetFlexForView(scroller_, 1);
 }
 
+HoverHighlightView* TrayDetailsView::AddScrollListItem(
+    const gfx::VectorIcon& icon,
+    const base::string16& text) {
+  HoverHighlightView* item = new HoverHighlightView(this);
+  if (icon.is_empty())
+    item->AddLabelRow(text);
+  else
+    item->AddIconAndLabel(gfx::CreateVectorIcon(icon, kMenuIconColor), text);
+  scroll_content_->AddChildView(item);
+  return item;
+}
+
+HoverHighlightView* TrayDetailsView::AddScrollListCheckableItem(
+    const gfx::VectorIcon& icon,
+    const base::string16& text,
+    bool checked) {
+  HoverHighlightView* item = AddScrollListItem(icon, text);
+  TrayPopupUtils::InitializeAsCheckableRow(item, checked);
+  return item;
+}
+
+HoverHighlightView* TrayDetailsView::AddScrollListCheckableItemWithoutIcon(
+    const base::string16& text,
+    bool checked) {
+  return AddScrollListCheckableItem(gfx::kNoneIcon, text, checked);
+}
+
+TriView* TrayDetailsView::AddScrollListSubHeader(const gfx::VectorIcon& icon,
+                                                 int text_id) {
+  TriView* header = TrayPopupUtils::CreateSubHeaderRowView(!icon.is_empty());
+  TrayPopupUtils::ConfigureAsStickyHeader(header);
+
+  views::Label* label = TrayPopupUtils::CreateDefaultLabel();
+  label->SetText(l10n_util::GetStringUTF16(text_id));
+  TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SUB_HEADER);
+  style.SetupLabel(label);
+  header->AddView(TriView::Container::CENTER, label);
+
+  if (!icon.is_empty()) {
+    views::ImageView* image_view = TrayPopupUtils::CreateMainImageView();
+    image_view->SetImage(gfx::CreateVectorIcon(
+        icon, GetNativeTheme()->GetSystemColor(
+                  ui::NativeTheme::kColorId_ProminentButtonColor)));
+    header->AddView(TriView::Container::START, image_view);
+  }
+
+  scroll_content_->AddChildView(header);
+  return header;
+}
+
+TriView* TrayDetailsView::AddScrollListSubHeaderWithoutIcon(int text_id) {
+  return AddScrollListSubHeader(gfx::kNoneIcon, text_id);
+}
+
 void TrayDetailsView::Reset() {
   RemoveAllChildViews(true);
   scroller_ = nullptr;
   scroll_content_ = nullptr;
   progress_bar_ = nullptr;
   back_button_ = nullptr;
   tri_view_ = nullptr;
 }
 
 void TrayDetailsView::ShowProgress(double value, bool visible) {
@@ skipping 75 matching lines @@
   if (bounds().IsEmpty())
     return views::View::GetHeightForWidth(width);
 
   // The height of the bubble that contains this detailed view is set to
   // the preferred height of the default view, and that determines the
   // initial height of |this|. Always request to stay the same height.
   return height();
 }
 
 }  // namespace ash