More closely align palette to spec.

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 29 matching lines @@
 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) {
+void HoverHighlightView::AddRightIcon(const gfx::ImageSkia& image,
+                                      int icon_size) {
   DCHECK(box_layout_);
   DCHECK(!right_icon_);
 
-  right_icon_ = new views::ImageView();
-  right_icon_->SetImageSize(
-      gfx::Size(kTrayPopupDetailsIconWidth, kTrayPopupDetailsIconWidth));
+  right_icon_ = new FixedSizedImageView(icon_size, icon_size);
   right_icon_->SetImage(image);
   right_icon_->SetEnabled(enabled());
   AddChildView(right_icon_);
 }
 
 void HoverHighlightView::SetRightIconVisible(bool visible) {
   if (!right_icon_)
     return;
 
   right_icon_->SetVisible(visible);
   Layout();
 }
 
 void HoverHighlightView::AddIconAndLabel(const gfx::ImageSkia& image,
                                          const base::string16& text,
                                          bool highlight) {
   box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3,
                                      kTrayPopupPaddingBetweenItems);
   SetLayoutManager(box_layout_);
-  DoAddIconAndLabel(image, text, highlight);
+  DoAddIconAndLabel(image, kTrayPopupDetailsIconWidth, text, highlight);
 }
 
-void HoverHighlightView::AddIndentedIconAndLabel(const gfx::ImageSkia& image,
-                                                 const base::string16& text,
-                                                 bool highlight) {
-  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal,
-                                     kTrayPopupPaddingHorizontal, 0,
-                                     kTrayPopupPaddingBetweenItems);
+void HoverHighlightView::AddIconAndLabelCustomSize(const gfx::ImageSkia& image,
+                                                   const base::string16& text,
+                                                   bool highlight,
+                                                   int icon_size,
+                                                   int indent,
+                                                   int space_between_items) {
+  box_layout_ = new views::BoxLayout(views::BoxLayout::kHorizontal, indent, 0,
+                                     space_between_items);
   SetLayoutManager(box_layout_);
-  DoAddIconAndLabel(image, text, highlight);
+  DoAddIconAndLabel(image, icon_size, text, highlight);
 }
 
 void HoverHighlightView::DoAddIconAndLabel(const gfx::ImageSkia& image,
+                                           int icon_size,
                                            const base::string16& text,
                                            bool highlight) {
   DCHECK(box_layout_);
 
-  views::ImageView* image_view =
-      new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
+  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());
@@ skipping 38 matching lines @@
                                                     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));
+    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));
@@ skipping 97 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