Reland cros: Small visual tweaks for material design palette.

Original patch got reverted due to compile error.

BUG=678034

Review-Url: https://codereview.chromium.org/2615263002
Cr-Commit-Position: refs/heads/master@{#442056}

ash/common/system/chromeos/palette/common_palette_tool.cc

@@ -89,8 +89,7 @@ views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {
                                           kMenuIconSize, gfx::kGoogleGreen700);
 
   highlight_view_ = new HoverHighlightView(this);
-  highlight_view_->SetBorder(
-      views::CreateEmptyBorder(0, kMenuExtraMarginFromLeftEdge, 0, 0));
+  highlight_view_->SetBorder(views::CreateEmptyBorder(0, 0, 0, 0));
   const int interior_button_padding = (kMenuButtonSize - kMenuIconSize) / 2;
   highlight_view_->AddIconAndLabelCustomSize(icon, name, false, kMenuIconSize,
                                              interior_button_padding,

ash/common/system/chromeos/palette/palette_tray.cc

@@ -45,31 +45,21 @@ namespace {
 
 // Predefined padding for the icon used in this tray. These are to be set to the
 // border of the icon, depending on the current |shelf_alignment()|.
-const int kHorizontalShelfHorizontalPadding = 8;
-const int kHorizontalShelfVerticalPadding = 4;
-const int kVerticalShelfHorizontalPadding = 2;
-const int kVerticalShelfVerticalPadding = 5;
+constexpr int kHorizontalShelfHorizontalPadding = 8;
+constexpr int kHorizontalShelfVerticalPadding = 4;
+constexpr int kVerticalShelfHorizontalPadding = 2;
+constexpr int kVerticalShelfVerticalPadding = 5;
 
 // Width of the palette itself (dp).
-const int kPaletteWidth = 332;
+constexpr int kPaletteWidth = 332;
 
 // Padding at the top/bottom of the palette (dp).
-const int kPalettePaddingOnTop = 4;
-const int kPalettePaddingOnBottom = 4;
-
-// Size of icon in the shelf (dp).
-const int kShelfIconSize = 18;
-
-// Vertical margin around the title view elements so that the title view height
-// matches kMenuButtonSize.
-const int kVerticalMarginAroundTitleView = 1;
+constexpr int kPalettePaddingOnTop = 4;
+constexpr int kPalettePaddingOnBottom = 2;
 
 // Margins between the title view and the edges around it (dp).
-const int kPaddingBetweenTitleAndLeftEdge = 12;
-const int kPaddingBetweenTitleAndSeparator = 3;
-
-// The distance between the title, help, and settings button in the title (dp).
-const int kHorizontalPaddingBetweenTitleEntries = 2;
+constexpr int kPaddingBetweenTitleAndLeftEdge = 12;
+constexpr int kPaddingBetweenTitleAndSeparator = 3;
 
 // Color of the separator.
 const SkColor kPaletteSeparatorColor = SkColorSetARGB(0x1E, 0x00, 0x00, 0x00);
@@ -90,9 +80,8 @@ class TitleView : public views::View, public views::ButtonListener {
   explicit TitleView(PaletteTray* palette_tray) : palette_tray_(palette_tray) {
     // TODO(tdanderson|jdufault): Use TriView to handle the layout of the title.
     // See crbug.com/614453.
-    auto* box_layout = new views::BoxLayout(
-        views::BoxLayout::kHorizontal, 0, kVerticalMarginAroundTitleView,
-        kHorizontalPaddingBetweenTitleEntries);
+    auto* box_layout =
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     SetLayoutManager(box_layout);
 
     title_label_ =
@@ -431,7 +420,7 @@ void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
           palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
-      kShelfIconSize, kShelfIconColor));
+      kTrayIconSize, kShelfIconColor));
 }
 
 void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {