[Ash MD] Remove some non-MD code from HoverHighlightView

ash/common/system/tray/hover_highlight_view.cc

Index: ash/common/system/tray/hover_highlight_view.cc
diff --git a/ash/common/system/tray/hover_highlight_view.cc b/ash/common/system/tray/hover_highlight_view.cc
index 739810c9076559400fdefd1f6149f22c1f317918..b6da58073a16b19a8503cd41a5167d818bb5003c 100644
--- a/ash/common/system/tray/hover_highlight_view.cc
+++ b/ash/common/system/tray/hover_highlight_view.cc
@@ -4,8 +4,6 @@
 
 #include "ash/common/system/tray/hover_highlight_view.h"
 
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/system/tray/tri_view.h"
@@ -26,8 +24,6 @@
 
 namespace {
 
-const int kCheckLabelPadding = 4;
-
 const gfx::FontList& GetFontList(bool highlight) {
   return ui::ResourceBundle::GetSharedInstance().GetFontList(
       highlight ? ui::ResourceBundle::BoldFont : ui::ResourceBundle::BaseFont);
@@ -39,11 +35,9 @@ namespace ash {
 
 HoverHighlightView::HoverHighlightView(ViewClickListener* listener)
     : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),
-      listener_(listener),
-      highlight_color_(kHoverBackgroundColor) {
+      listener_(listener) {
   set_notify_enter_exit_on_child(true);
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    SetInkDropMode(InkDropHostView::InkDropMode::ON);
+  SetInkDropMode(InkDropHostView::InkDropMode::ON);
 }
 
 HoverHighlightView::~HoverHighlightView() {}
@@ -59,32 +53,19 @@ bool HoverHighlightView::GetTooltipText(const gfx::Point& p,
 void HoverHighlightView::AddRightIcon(const gfx::ImageSkia& image,
                                       int icon_size) {
   DCHECK(!right_view_);
-
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    views::ImageView* right_icon = TrayPopupUtils::CreateMainImageView();
-    right_icon->SetImage(image);
-    AddRightView(right_icon);
-    return;
-  }
-
-  views::ImageView* right_icon = new FixedSizedImageView(icon_size, icon_size);
+  views::ImageView* right_icon = TrayPopupUtils::CreateMainImageView();
   right_icon->SetImage(image);
   AddRightView(right_icon);
 }
 
 void HoverHighlightView::AddRightView(views::View* view) {
   DCHECK(!right_view_);
-
   right_view_ = view;
   right_view_->SetEnabled(enabled());
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    DCHECK(tri_view_);
-    tri_view_->AddView(TriView::Container::END, right_view_);
-    tri_view_->SetContainerVisible(TriView::Container::END, true);
-    return;
-  }
-  DCHECK(box_layout_);
-  AddChildView(right_view_);
+
+  DCHECK(tri_view_);
+  tri_view_->AddView(TriView::Container::END, right_view_);
+  tri_view_->SetContainerVisible(TriView::Container::END, true);
 }
 
 // TODO(tdanderson): Ensure all checkable detailed view rows use this
@@ -99,91 +80,26 @@ void HoverHighlightView::SetRightViewVisible(bool visible) {
 }
 
 void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
-                                         const base::string16& text,
-                                         bool highlight) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    DoAddIconAndLabelMd(image, text,
-                        TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
-    return;
-  }
-
-  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
-                                     kTrayPopupPaddingBetweenItems);
-  SetLayoutManager(box_layout_);
-  DoAddIconAndLabel(image, kTrayPopupDetailsIconWidth, text, highlight);
+                                         const base::string16& text) {
+  DoAddIconAndLabelsMd(image, text,
+                       TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL,
+                       base::string16());
 }
 
 void HoverHighlightView::AddIconAndLabels(const gfx::ImageSkia& image,
                                           const base::string16& text,
                                           const base::string16& sub_text) {
-  DCHECK(MaterialDesignController::IsSystemTrayMenuMaterial());
   DoAddIconAndLabelsMd(image, text,
                        TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL,
                        sub_text);
 }
 
-void HoverHighlightView::AddIconAndLabelCustomSize(const gfx::ImageSkia& image,
-                                                   const base::string16& text,
-                                                   bool highlight,
-                                                   int icon_size,
-                                                   int indent,
-                                                   int space_between_items) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    DoAddIconAndLabelMd(image, text,
-                        TrayPopupItemStyle::FontStyle::DETAILED_VIEW_LABEL);
-    return;
-  }
-
-  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, indent, 0,
-                                     space_between_items);
-  SetLayoutManager(box_layout_);
-  DoAddIconAndLabel(image, icon_size, text, highlight);
-}
-
 void HoverHighlightView::AddIconAndLabelForDefaultView(
     const gfx::ImageSkia& image,
-    const base::string16& text,
-    bool highlight) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    DoAddIconAndLabelMd(image, text,
-                        TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-    return;
-  }
-
-  // For non-MD, call AddIconAndLabel() so that |box_layout_| is instantiated
-  // and installed as the layout manager.
-  AddIconAndLabel(image, text, highlight);
-}
-
-void HoverHighlightView::DoAddIconAndLabel(const gfx::ImageSkia& image,
-                                           int icon_size,
-                                           const base::string16& text,
-                                           bool highlight) {
-  DCHECK(!MaterialDesignController::IsSystemTrayMenuMaterial());
-  DCHECK(box_layout_);
-
-  views::ImageView* image_view = new FixedSizedImageView(icon_size, 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);
-}
-
-void HoverHighlightView::DoAddIconAndLabelMd(
-    const gfx::ImageSkia& image,
-    const base::string16& text,
-    TrayPopupItemStyle::FontStyle font_style) {
-  DoAddIconAndLabelsMd(image, text, font_style, base::string16());
+    const base::string16& text) {
+  DoAddIconAndLabelsMd(image, text,
+                       TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL,
+                       base::string16());
 }
 
 void HoverHighlightView::DoAddIconAndLabelsMd(
@@ -191,8 +107,6 @@ void HoverHighlightView::DoAddIconAndLabelsMd(
     const base::string16& text,
     TrayPopupItemStyle::FontStyle font_style,
     const base::string16& sub_text) {
-  DCHECK(MaterialDesignController::IsSystemTrayMenuMaterial());
-
   SetLayoutManager(new views::FillLayout);
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
   AddChildView(tri_view_);
@@ -223,6 +137,9 @@ void HoverHighlightView::DoAddIconAndLabelsMd(
   SetAccessibleName(text);
 }
 
+// TODO(tdanderson): Remove the SelectableHoverHighlightView class, and then
+// audit for what additional cleanup is needed so that AddLabel() can be
+// removed. See crbug.com/686345.
 views::Label* HoverHighlightView::AddLabel(const base::string16& text,
                                            gfx::HorizontalAlignment alignment,
                                            bool highlight) {
@@ -244,8 +161,6 @@ views::Label* HoverHighlightView::AddLabel(const base::string16& text,
   // 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);
@@ -254,47 +169,7 @@ views::Label* HoverHighlightView::AddLabel(const base::string16& text,
   return text_label_;
 }
 
-views::Label* HoverHighlightView::AddCheckableLabel(const base::string16& text,
-                                                    bool highlight,
-                                                    bool checked) {
-  DCHECK(!MaterialDesignController::IsSystemTrayMenuMaterial());
-
-  if (checked) {
-    accessibility_state_ = AccessibilityState::CHECKED_CHECKBOX;
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    const gfx::ImageSkia* check =
-        rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia();
-    int margin = kTrayPopupPaddingHorizontal +
-                 kTrayPopupDetailsLabelExtraLeftMargin - kCheckLabelPadding;
-    box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
-                                       kCheckLabelPadding);
-    SetLayoutManager(box_layout_);
-    views::ImageView* image_view = new FixedSizedImageView(margin, 0);
-    image_view->SetImage(check);
-    image_view->SetHorizontalAlignment(views::ImageView::TRAILING);
-    image_view->SetEnabled(enabled());
-    AddChildView(image_view);
-
-    text_label_ = new views::Label(text);
-    text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    text_label_->SetFontList(GetFontList(highlight));
-    text_label_->SetDisabledColor(SkColorSetARGB(127, 0, 0, 0));
-    if (text_default_color_)
-      text_label_->SetEnabledColor(text_default_color_);
-    text_label_->SetEnabled(enabled());
-    AddChildView(text_label_);
-
-    SetAccessibleName(text);
-    return text_label_;
-  }
-
-  accessibility_state_ = AccessibilityState::UNCHECKED_CHECKBOX;
-  return AddLabel(text, gfx::ALIGN_LEFT, highlight);
-}
-
-void HoverHighlightView::AddLabelRowMd(const base::string16& text) {
-  DCHECK(MaterialDesignController::IsSystemTrayMenuMaterial());
-
+void HoverHighlightView::AddLabelRow(const base::string16& text) {
   SetLayoutManager(new views::FillLayout);
   tri_view_ = TrayPopupUtils::CreateDefaultRowView();
   AddChildView(tri_view_);
@@ -316,16 +191,6 @@ void HoverHighlightView::SetExpandable(bool expandable) {
   }
 }
 
-void HoverHighlightView::SetHighlight(bool highlight) {
-  // Do not change the font styling for a highlighted row in material design.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  DCHECK(text_label_);
-  text_label_->SetFontList(GetFontList(highlight));
-  text_label_->InvalidateLayout();
-}
-
 void HoverHighlightView::SetAccessiblityState(
     AccessibilityState accessibility_state) {
   accessibility_state_ = accessibility_state;
@@ -333,25 +198,6 @@ void HoverHighlightView::SetAccessiblityState(
     NotifyAccessibilityEvent(ui::AX_EVENT_CHECKED_STATE_CHANGED, true);
 }
 
-void HoverHighlightView::SetHoverHighlight(bool hover) {
-  // We do not show any hover effects for material design.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
-  if (!enabled() && hover)
-    return;
-  if (hover_ == hover)

[tdanderson, 2017/02/14 22:48:20]

Mohsen and +varkha@, on second thought I think we may actually want to keep
tracking the state of |hover_| even in MD (though we don't want to change any
colors as in lines 349, 351). If you look at the call sites of the hover()
accessor, it looks as though this at one time served the purpose of preventing a
detailed view list from moving the element underneath the cursor outside the
visible region while the list was still being populated. We may have broken this
with the MD work. Mind taking a second look and letting me know what you think?

-    return;
-  hover_ = hover;
-  if (!text_label_)
-    return;
-  if (hover_ && text_highlight_color_)
-    text_label_->SetEnabledColor(text_highlight_color_);
-  if (!hover_ && text_default_color_)
-    text_label_->SetEnabledColor(text_default_color_);
-  SchedulePaint();
-}
-
 bool HoverHighlightView::PerformAction(const ui::Event& event) {
   if (!listener_)
     return false;
@@ -387,46 +233,13 @@ int HoverHighlightView::GetHeightForWidth(int width) const {
   return GetPreferredSize().height();
 }
 
-void HoverHighlightView::OnMouseEntered(const ui::MouseEvent& event) {
-  SetHoverHighlight(true);
-}
-
-void HoverHighlightView::OnMouseExited(const ui::MouseEvent& event) {
-  SetHoverHighlight(false);
-}
-
-void HoverHighlightView::OnGestureEvent(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
-    SetHoverHighlight(true);
-  } else if (event->type() == ui::ET_GESTURE_TAP_CANCEL ||
-             event->type() == ui::ET_GESTURE_TAP) {
-    SetHoverHighlight(false);
-  }
-  ActionableView::OnGestureEvent(event);
-}
-
-void HoverHighlightView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  SetHoverHighlight(IsMouseHovered());
-}
-
 void HoverHighlightView::OnEnabledChanged() {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    if (left_icon_)
-      left_icon_->SetEnabled(enabled());
-    if (text_label_)
-      text_label_->SetEnabled(enabled());
-    if (right_view_)
-      right_view_->SetEnabled(enabled());
-  } else {
-    if (!enabled())
-      SetHoverHighlight(false);
-    for (int i = 0; i < child_count(); ++i)
-      child_at(i)->SetEnabled(enabled());
-  }
-}
-
-void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) {
-  canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
+  if (left_icon_)
+    left_icon_->SetEnabled(enabled());
+  if (text_label_)
+    text_label_->SetEnabled(enabled());
+  if (right_view_)
+    right_view_->SetEnabled(enabled());
 }
 
 void HoverHighlightView::OnFocus() {