Extend HoverHighlightView

ash/common/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/common/system/tray/hover_highlight_view.h"
 
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 16 matching lines @@
 const gfx::FontList& GetFontList(bool highlight) {
   return ui::ResourceBundle::GetSharedInstance().GetFontList(
       highlight ? ui::ResourceBundle::BoldFont : ui::ResourceBundle::BaseFont);
 }
 
 }  // namespace
 
 namespace ash {
 
 HoverHighlightView::HoverHighlightView(ViewClickListener* listener)
-    : listener_(listener),
-      text_label_(NULL),
-      highlight_color_(kHoverBackgroundColor),
-      default_color_(0),
-      text_highlight_color_(0),
-      text_default_color_(0),
-      hover_(false),
-      expandable_(false),
-      checkable_(false),
-      checked_(false) {
+    : listener_(listener), highlight_color_(kHoverBackgroundColor) {
   set_notify_enter_exit_on_child(true);
 }
 
 HoverHighlightView::~HoverHighlightView() {}
 
 bool HoverHighlightView::GetTooltipText(const gfx::Point& p,
                                         base::string16* tooltip) const {
   if (tooltip_.empty())
     return false;
   *tooltip = tooltip_;
   return true;
 }
 
+void HoverHighlightView::AddRightIcon(const gfx::ImageSkia& image) {
+  DCHECK(box_layout_);

[stevenjb, 2016/07/13 19:51:01]

DCHECK(!right_icon_)

[jdufault, 2016/07/13 21:53:50]

Done.

+
+  right_icon_ = new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
+  right_icon_->SetImage(image);
+  right_icon_->SetEnabled(enabled());
+  AddChildView(right_icon_);
+}
+
+void HoverHighlightView::SetRightIconVisible(bool visible) {
+  if (right_icon_) {

[stevenjb, 2016/07/13 19:51:01]

nit: invert and early exit

[jdufault, 2016/07/13 21:53:50]

Done.

+    right_icon_->SetVisible(visible);
+    Layout();
+  }
+}
+
 void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
                                          const base::string16& text,
                                          bool highlight) {
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
-                                        kTrayPopupPaddingBetweenItems));
+  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
+                                     kTrayPopupPaddingBetweenItems);
+  SetLayoutManager(box_layout_);
   DoAddIconAndLabel(image, text, highlight);
 }
 
 void HoverHighlightView::AddIndentedIconAndLabel(const gfx::ImageSkia& image,
                                                  const base::string16& text,
                                                  bool highlight) {
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
-                                        kTrayPopupPaddingHorizontal, 0,
-                                        kTrayPopupPaddingBetweenItems));
+  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal,
+                                     kTrayPopupPaddingHorizontal, 0,
+                                     kTrayPopupPaddingBetweenItems);
+  SetLayoutManager(box_layout_);
   DoAddIconAndLabel(image, text, highlight);
 }
 
 void HoverHighlightView::DoAddIconAndLabel(const gfx::ImageSkia& image,
                                            const base::string16& text,
                                            bool highlight) {
+  DCHECK(box_layout_);
+
   views::ImageView* image_view =
       new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
   image_view->SetImage(image);
   image_view->SetEnabled(enabled());
   AddChildView(image_view);
 
   text_label_ = new views::Label(text);
   text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   text_label_->SetFontList(GetFontList(highlight));
   if (text_default_color_)
     text_label_->SetEnabledColor(text_default_color_);
   text_label_->SetEnabled(enabled());
   AddChildView(text_label_);
+  box_layout_->SetFlexForView(text_label_, 1);
 
   SetAccessibleName(text);
 }
 
 views::Label* HoverHighlightView::AddLabel(const base::string16& text,
                                            gfx::HorizontalAlignment alignment,
                                            bool highlight) {
-  SetLayoutManager(new views::FillLayout());
+  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
+  SetLayoutManager(box_layout_);
   text_label_ = new views::Label(text);
   int left_margin = kTrayPopupPaddingHorizontal;
   int right_margin = kTrayPopupPaddingHorizontal;
   if (alignment != gfx::ALIGN_CENTER) {
     if (base::i18n::IsRTL())
       right_margin += kTrayPopupDetailsLabelExtraLeftMargin;
     else
       left_margin += kTrayPopupDetailsLabelExtraLeftMargin;
   }
   text_label_->SetBorder(
       views::Border::CreateEmptyBorder(5, left_margin, 5, right_margin));
   text_label_->SetHorizontalAlignment(alignment);
   text_label_->SetFontList(GetFontList(highlight));
   // Do not set alpha value in disable color. It will have issue with elide
   // blending filter in disabled state for rendering label text color.
   text_label_->SetDisabledColor(SkColorSetARGB(255, 127, 127, 127));
   if (text_default_color_)
     text_label_->SetEnabledColor(text_default_color_);
   text_label_->SetEnabled(enabled());
   AddChildView(text_label_);
+  box_layout_->SetFlexForView(text_label_, 1);
 
   SetAccessibleName(text);
   return text_label_;
 }
 
 views::Label* HoverHighlightView::AddCheckableLabel(const base::string16& text,
                                                     bool highlight,
                                                     bool checked) {
   checkable_ = true;
   checked_ = checked;
@@ skipping 26 matching lines @@
   return AddLabel(text, gfx::ALIGN_LEFT, highlight);
 }
 
 void HoverHighlightView::SetExpandable(bool expandable) {
   if (expandable != expandable_) {
     expandable_ = expandable;
     InvalidateLayout();
   }
 }
 
+void HoverHighlightView::SetHighlight(bool highlight) {
+  DCHECK(text_label_);
+  text_label_->SetFontList(GetFontList(highlight));
+  text_label_->InvalidateLayout();
+}
+
 void HoverHighlightView::SetHoverHighlight(bool hover) {
   if (!enabled() && hover)
     return;
   if (hover_ == hover)
     return;
   hover_ = hover;
   if (!text_label_)
     return;
   if (hover_ && text_highlight_color_)
     text_label_->SetEnabledColor(text_highlight_color_);
@@ skipping 64 matching lines @@
 void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) {
   canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash