Set maximum size for HoverHighlightView right icon.

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 34 matching lines @@
   if (tooltip_.empty())
     return false;
   *tooltip = tooltip_;
   return true;
 }
 
 void HoverHighlightView::AddRightIcon(const gfx::ImageSkia& image) {
   DCHECK(box_layout_);
   DCHECK(!right_icon_);
 
-  right_icon_ = new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
+  right_icon_ = new views::ImageView();
+  right_icon_->SetImageSize(
+      gfx::Size(kTrayPopupDetailsIconWidth, kTrayPopupDetailsIconWidth));

[stevenjb, 2016/07/21 20:32:05]

Is this not a problem for other FixedSizedImageView instances? (i.e., should we
fix it there instead?)

[jdufault, 2016/07/22 21:44:58]

From my current understanding, FixedSizedImageView is fixed-size w.r.t. the size
of the layout space / view. Confusingly, this is unrelated to the size of the
rendered image (though the rendered image will get clipped to the maximum view
size).

A lot of the other users of FixedSizedImageView want the layout size to be
larger than the rendered image size, so blindly calling SetImageSize() in the
FixedSizedImageView constructor distorts lots of icons.

I think the right solution is to have FixedSizedImageView set the rendered image
size as well, and convert the existing users to use insets instead of having a
different layout size/image size. I believe this would also eliminate the CENTER
alignment calls.

If we did that, I think it'd be reasonable to eliminate FixedSizeImageView
entirely.

All of this assumes that we actually want the image size and not the layout size
to be fixed. If we want the image size to remain dynamic, then I think this CL
is probably okay as is.

[stevenjb, 2016/07/22 21:50:40]

Fair enough, I just wanted to make sure we had thougt it through, sounds like it
has been :)

   right_icon_->SetImage(image);
   right_icon_->SetEnabled(enabled());
   AddChildView(right_icon_);
 }
 
 void HoverHighlightView::SetRightIconVisible(bool visible) {
   if (!right_icon_)
     return;
 
   right_icon_->SetVisible(visible);
@@ skipping 197 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