Fix two issues with HoverHighlightView

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/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/view_click_listener.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 55 matching lines @@
                                         kTrayPopupPaddingBetweenItems));
   DoAddIconAndLabel(image, text, highlight);
 }
 
 void HoverHighlightView::DoAddIconAndLabel(const gfx::ImageSkia& image,
                                            const base::string16& text,
                                            bool highlight) {
   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_);
 
   SetAccessibleName(text);
 }
 
 views::Label* HoverHighlightView::AddLabel(const base::string16& text,
                                            gfx::HorizontalAlignment alignment,
                                            bool highlight) {
   SetLayoutManager(new views::FillLayout());
   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_);
 
   SetAccessibleName(text);
   return text_label_;
 }
 
 views::Label* HoverHighlightView::AddCheckableLabel(const base::string16& text,
                                                     bool highlight,
                                                     bool checked) {
   checkable_ = true;
   checked_ = checked;
   if (checked) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const gfx::ImageSkia* check =
         rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia();
     int margin = kTrayPopupPaddingHorizontal +
         kTrayPopupDetailsLabelExtraLeftMargin - kCheckLabelPadding;
     SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 3, kCheckLabelPadding));
     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_;
   }
   return AddLabel(text, gfx::ALIGN_LEFT, highlight);
 }
 
 void HoverHighlightView::SetExpandable(bool expandable) {
   if (expandable != expandable_) {
     expandable_ = expandable;
     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_);
   if (!hover_ && text_default_color_)
     text_label_->SetEnabledColor(text_default_color_);
   SchedulePaint();
@@ skipping 45 matching lines @@
     }
   }
   ActionableView::OnGestureEvent(event);
 }
 
 void HoverHighlightView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   SetHoverHighlight(IsMouseHovered());
 }
 
 void HoverHighlightView::OnEnabledChanged() {
+  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_);
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash