Revert of cros: Small visual tweaks for material design palette.

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

 // Copyright 2016 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/chromeos/palette/palette_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 27 matching lines @@
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 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()|.
-constexpr int kHorizontalShelfHorizontalPadding = 8;
-constexpr int kHorizontalShelfVerticalPadding = 4;
-constexpr int kVerticalShelfHorizontalPadding = 2;
-constexpr int kVerticalShelfVerticalPadding = 5;
+const int kHorizontalShelfHorizontalPadding = 8;
+const int kHorizontalShelfVerticalPadding = 4;
+const int kVerticalShelfHorizontalPadding = 2;
+const int kVerticalShelfVerticalPadding = 5;
 
 // Width of the palette itself (dp).
-constexpr int kPaletteWidth = 332;
+const int kPaletteWidth = 332;
 
 // Padding at the top/bottom of the palette (dp).
-constexpr int kPalettePaddingOnTop = 4;
-constexpr int kPalettePaddingOnBottom = 2;
+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;
 
 // Margins between the title view and the edges around it (dp).
-constexpr int kPaddingBetweenTitleAndLeftEdge = 12;
-constexpr int kPaddingBetweenTitleAndSeparator = 3;
+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;
 
 // Color of the separator.
-constexpr SkColor kPaletteSeparatorColor =
-    SkColorSetARGB(0x1E, 0x00, 0x00, 0x00);
+const SkColor kPaletteSeparatorColor = SkColorSetARGB(0x1E, 0x00, 0x00, 0x00);
 
 // Returns true if we are in a user session that can show the stylus tools.
 bool IsInUserSession() {
   SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   return !session_state_delegate->IsUserSessionBlocked() &&
          session_state_delegate->GetSessionState() ==
              session_manager::SessionState::ACTIVE &&
          WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
              LoginStatus::KIOSK_APP;
 }
 
 class TitleView : public views::View, public views::ButtonListener {
  public:
   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, 0, 0);
+    auto* box_layout = new views::BoxLayout(
+        views::BoxLayout::kHorizontal, 0, kVerticalMarginAroundTitleView,
+        kHorizontalPaddingBetweenTitleEntries);
     SetLayoutManager(box_layout);
 
     title_label_ =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE));
     title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(title_label_);
     box_layout->SetFlexForView(title_label_, 1);
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       help_button_ =
           new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
@@ skipping 318 matching lines @@
   } else {
     icon_->SetBorder(views::CreateEmptyBorder(gfx::Insets(
         kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
   }
 }
 
 void PaletteTray::UpdateTrayIcon() {
   icon_->SetImage(CreateVectorIcon(
       palette_tool_manager_->GetActiveTrayIcon(
           palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
-      kTrayIconSize, kShelfIconColor));
+      kShelfIconSize, kShelfIconColor));
 }
 
 void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {
   PaletteDelegate* palette_delegate = WmShell::Get()->palette_delegate();
 
   // Don't do anything if the palette should not be shown or if the user has
   // disabled it all-together.
   if (!IsInUserSession() || !palette_delegate->ShouldShowPalette())
     return;
 
@@ skipping 21 matching lines @@
   } else {
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(is_palette_enabled_ && IsInUserSession());
 }
 
 }  // namespace ash