Index: ash/common/system/chromeos/palette/palette_tray.cc |
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc |
index 179be69fd967c0b5e0bbcde240bccb65415f2f16..1526697ff8309c144d12fd1b21dfe05532d0bd86 100644 |
--- a/ash/common/system/chromeos/palette/palette_tray.cc |
+++ b/ash/common/system/chromeos/palette/palette_tray.cc |
@@ -55,22 +55,12 @@ const 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; |
+const int kPalettePaddingOnBottom = 2; |
stevenjb
2017/01/04 18:27:34
nit: change all of these to use constexpr while yo
jdufault
2017/01/05 22:35:39
Done.
|
// 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; |
- |
// 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) { |