Reset HoverHighlightView state before re-populating

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 13 matching lines @@
     : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),
       listener_(listener) {
   set_notify_enter_exit_on_child(true);
   SetInkDropMode(InkDropHostView::InkDropMode::ON);
 }
 
 HoverHighlightView::~HoverHighlightView() {}
 
 void HoverHighlightView::AddRightIcon(const gfx::ImageSkia& image,
                                       int icon_size) {
+  DCHECK(is_populated_);
   DCHECK(!right_view_);
 
   views::ImageView* right_icon = TrayPopupUtils::CreateMainImageView();
   right_icon->SetImage(image);
   AddRightView(right_icon);
 }
 
 void HoverHighlightView::AddRightView(views::View* view) {
+  DCHECK(is_populated_);
   DCHECK(!right_view_);
 
   right_view_ = view;
   right_view_->SetEnabled(enabled());
   tri_view_->AddView(TriView::Container::END, right_view_);
   tri_view_->SetContainerVisible(TriView::Container::END, true);
 }
 
 void HoverHighlightView::SetRightViewVisible(bool visible) {
+  DCHECK(is_populated_);
   if (!right_view_)
     return;
 
   right_view_->SetVisible(visible);
   Layout();
 }
 
 void HoverHighlightView::SetSubText(const base::string16& sub_text) {
+  DCHECK(is_populated_);
   DCHECK(text_label_);
   DCHECK(!sub_text.empty());
 
   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);
@@ skipping 27 matching lines @@
     const base::string16& text,
     TrayPopupItemStyle::FontStyle font_style) {
   DoAddIconAndLabels(image, text, font_style, base::string16());
 }
 
 void HoverHighlightView::DoAddIconAndLabels(
     const gfx::ImageSkia& image,
     const base::string16& text,
     TrayPopupItemStyle::FontStyle font_style,
     const base::string16& sub_text) {
+  DCHECK(!is_populated_);
+  is_populated_ = true;
+
   SetLayoutManager(new views::FillLayout);
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
   AddChildView(tri_view_);
 
   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_);
 
   if (!sub_text.empty())
     SetSubText(sub_text);
 
   tri_view_->SetContainerVisible(TriView::Container::END, false);
 
   SetAccessibleName(text);
 }
 
 void HoverHighlightView::AddLabelRow(const base::string16& text) {
+  DCHECK(!is_populated_);
+  is_populated_ = true;
+
   SetLayoutManager(new views::FillLayout);
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
   AddChildView(tri_view_);
 
   text_label_ = TrayPopupUtils::CreateDefaultLabel();
   text_label_->SetText(text);
 
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
   style.SetupLabel(text_label_);
   tri_view_->AddView(TriView::Container::CENTER, text_label_);
 
   SetAccessibleName(text);
 }
 
 void HoverHighlightView::SetExpandable(bool expandable) {
   if (expandable != expandable_) {
     expandable_ = expandable;
     InvalidateLayout();
   }
 }
 
 void HoverHighlightView::SetAccessiblityState(
     AccessibilityState accessibility_state) {
   accessibility_state_ = accessibility_state;
   if (accessibility_state_ != AccessibilityState::DEFAULT)
     NotifyAccessibilityEvent(ui::AX_EVENT_CHECKED_STATE_CHANGED, true);
 }
 
+void HoverHighlightView::Reset() {
+  RemoveAllChildViews(true);
+  text_label_ = nullptr;
+  sub_text_label_ = nullptr;
+  left_icon_ = nullptr;
+  right_view_ = nullptr;
+  tri_view_ = nullptr;
+  is_populated_ = false;
+}
+
 bool HoverHighlightView::PerformAction(const ui::Event& event) {
   if (!listener_)
     return false;
   listener_->OnViewClicked(this);
   return true;
 }
 
 void HoverHighlightView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   ActionableView::GetAccessibleNodeData(node_data);
 
@@ skipping 32 matching lines @@
   if (right_view_)
     right_view_->SetEnabled(enabled());
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash