Refactor AddScrollListItem() in system menu detailed views

ash/system/tray/hover_highlight_view.cc

 // Copyright 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/hover_highlight_view.h"
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tri_view.h"
@@ skipping 37 matching lines @@
 }
 
 void HoverHighlightView::SetRightViewVisible(bool visible) {
   if (!right_view_)
     return;
 
   right_view_->SetVisible(visible);
   Layout();
 }
 
+void HoverHighlightView::SetSubText(const base::string16& sub_text) {

[tdanderson, 2017/04/24 15:43:39]

As far as I can tell, right now there are no places where SetSubText() is being
called with an empty label. If so, I suggest removing that functionality from
SetSubText() for this CL (which means you'd also remove the
TriView::RemoveView() function in this CL too). Instead introduce the new
functionality in a subsequent CL when it is in use.

[mohsen, 2017/04/25 05:10:01]

Done.

+  DCHECK(text_label_);
+
+  if (sub_text.empty()) {
+    if (!sub_text_label_)
+      return;
+    tri_view_->RemoveView(TriView::Container::CENTER, sub_text_label_);
+    delete sub_text_label_;
+    sub_text_label_ = nullptr;
+  } else {
+    if (!sub_text_label_) {
+      sub_text_label_ = TrayPopupUtils::CreateDefaultLabel();
+      tri_view_->AddView(TriView::Container::CENTER, sub_text_label_);
+    }
+    TrayPopupItemStyle sub_style(TrayPopupItemStyle::FontStyle::CAPTION);
+    sub_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
+    sub_style.SetupLabel(sub_text_label_);
+    sub_text_label_->SetText(sub_text);
+  }
+}
+
 void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
                                          const base::string16& text) {
   DoAddIconAndLabel(image, text,
                     TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
 }
 
 void HoverHighlightView::AddIconAndLabels(const gfx::ImageSkia& image,
                                           const base::string16& text,
                                           const base::string16& sub_text) {
   DoAddIconAndLabels(image, text,
@@ skipping 27 matching lines @@
   left_icon_ = TrayPopupUtils::CreateMainImageView();
   left_icon_->SetImage(image);
   left_icon_->SetEnabled(enabled());
   tri_view_->AddView(TriView::Container::START, left_icon_);
 
   text_label_ = TrayPopupUtils::CreateDefaultLabel();
   text_label_->SetText(text);
   text_label_->SetEnabled(enabled());
   TrayPopupItemStyle style(font_style);
   style.SetupLabel(text_label_);
+  tri_view_->AddView(TriView::Container::CENTER, text_label_);
 
-  tri_view_->AddView(TriView::Container::CENTER, text_label_);
-  if (!sub_text.empty()) {
-    sub_text_label_ = TrayPopupUtils::CreateDefaultLabel();
-    sub_text_label_->SetText(sub_text);
-    TrayPopupItemStyle sub_style(TrayPopupItemStyle::FontStyle::CAPTION);
-    sub_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
-    sub_style.SetupLabel(sub_text_label_);
-    tri_view_->AddView(TriView::Container::CENTER, sub_text_label_);
-  }
+  SetSubText(sub_text);
 
   tri_view_->SetContainerVisible(TriView::Container::END, false);
 
   SetAccessibleName(text);
 }
 
 void HoverHighlightView::AddLabelRow(const base::string16& text) {
   SetLayoutManager(new views::FillLayout);
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
   AddChildView(tri_view_);
@@ skipping 67 matching lines @@
   if (right_view_)
     right_view_->SetEnabled(enabled());
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash