More closely align palette to spec.

ash/common/system/tray/hover_highlight_view.h

 // Copyright 2013 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_
 #define ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_
 
 #include "ash/common/system/tray/actionable_view.h"
 #include "base/macros.h"
 #include "ui/gfx/font.h"
@@ skipping 20 matching lines @@
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
 
   // Convenience function for adding an icon and a label. This also sets the
   // accessible name.
   void AddIconAndLabel(const gfx::ImageSkia& image,
                        const base::string16& text,
                        bool highlight);
 
   // Convenience function for adding an icon and a label. This also sets the
-  // accessible name. The icon has an indent equal to
-  // kTrayPopupPaddingHorizontal.
-  void AddIndentedIconAndLabel(const gfx::ImageSkia& image,
-                               const base::string16& text,
-                               bool highlight);
+  // accessible name. This method allows the indent and spacing between elements
+  // to be set by the caller. |icon_size| is the size of the icon. |indent| is
+  // the distance between the edges of the view and the icons, and
+  // |space_between_items| is the minimum distance between any two child views.
+  // All distances are in DP.
+  void AddIconAndLabelCustomSize(const gfx::ImageSkia& image,
+                                 const base::string16& text,
+                                 bool highlight,
+                                 int icon_size,
+                                 int indent,
+                                 int space_between_items);
 
   // Convenience function for adding a label with padding on the left for a
   // blank icon. This also sets the accessible name. Returns label after
   // parenting it.
   views::Label* AddLabel(const base::string16& text,
                          gfx::HorizontalAlignment alignment,
                          bool highlight);
 
   // Convenience function for adding an optional check and a label. In the
   // absence of a check, padding is added to align with checked items.
   // Returns label after parenting it.
   views::Label* AddCheckableLabel(const base::string16& text,
                                   bool highlight,
                                   bool checked);
 
   // Add an optional right icon to an already established view (call one of
-  // the other Add* functions first).
-  void AddRightIcon(const gfx::ImageSkia& image);
+  // the other Add* functions first). |icon_size| is the size of the icon in DP.
+  void AddRightIcon(const gfx::ImageSkia& image, int icon_size);
 
   // Hide or show the right icon.
   void SetRightIconVisible(bool visible);
 
   // Allows view to expand its height.
   // Size of unexapandable view is fixed and equals to kTrayPopupItemHeight.
   void SetExpandable(bool expandable);
 
   // Enables or disable highlighting on the label, where a highlighted label
   // just uses a bold font.
@@ skipping 13 matching lines @@
  protected:
   // Overridden from views::View.
   void GetAccessibleState(ui::AXViewState* state) override;
 
   // Sets the highlighted color on a text label if |hover| is set.
   void SetHoverHighlight(bool hover);
 
  private:
   // Actually adds the icon and label but does not set the layout manager
   void DoAddIconAndLabel(const gfx::ImageSkia& image,
+                         int icon_size,
                          const base::string16& text,
                          bool highlight);
 
   // Overridden from ActionableView:
   bool PerformAction(const ui::Event& event) override;
 
   // Overridden from views::View.
   gfx::Size GetPreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
@@ skipping 17 matching lines @@
   bool checkable_ = false;
   bool checked_ = false;
   base::string16 tooltip_;
 
   DISALLOW_COPY_AND_ASSIGN(HoverHighlightView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_