Fix holding space item chip insets.

Insets were a little off spec in that:
- Label was 4dip too close to right edge
- Pin toggle was 2dip too close to right edge

This CL also reduces scope of some item chip related constants.

Bug: 1164608
Change-Id: If5050bcd3636f3cb2d7da6347c80d09f5a4a7238
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2619083Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#841798}

ash/public/cpp/holding_space/holding_space_constants.h

@@ -16,22 +16,13 @@ constexpr int kHoldingSpaceBubbleContainerChildSpacing = 8;
 constexpr int kHoldingSpaceBubbleWidth = 360;
 constexpr gfx::Insets kHoldingSpaceChildBubblePadding(16);
 constexpr int kHoldingSpaceChildBubbleChildSpacing = 16;
-constexpr gfx::Insets kHoldingSpaceChipPadding(8);
-constexpr int kHoldingSpaceChipChildSpacing = 8;
-constexpr int kHoldingSpaceChipHeight = 40;
 constexpr int kHoldingSpaceChipIconSize = 24;
-constexpr int kHoldingSpaceChipWidth = 160;
-constexpr int kHoldingSpaceChipLabelMaskGradientWidth = 16;
-constexpr int kHoldingSpaceChipsPerRow = 2;
-constexpr int kHoldingSpaceColumnSpacing = 8;
-constexpr int kHoldingSpaceColumnWidth = 160;
 constexpr int kHoldingSpaceContextMenuMargin = 8;
 constexpr int kHoldingSpaceCornerRadius = 8;
 constexpr int kHoldingSpaceDownloadsChevronIconSize = 20;
 constexpr int kHoldingSpaceDownloadsHeaderSpacing = 16;
 constexpr int kHoldingSpaceFocusInsets = -2;
 constexpr int kHoldingSpaceIconSize = 20;
-constexpr int kHoldingSpaceRowSpacing = 8;
 constexpr gfx::Insets kHoldingSpaceScreenCapturePadding(8);
 constexpr gfx::Size kHoldingSpaceScreenCapturePinButtonSize(24, 24);
 constexpr gfx::Size kHoldingSpaceScreenCapturePlayIconSize(32, 32);

ash/system/holding_space/holding_space_item_chip_view.cc

@@ -15,6 +15,7 @@
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/skia_paint_util.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
@@ -23,6 +24,14 @@
 
 namespace ash {
 
+// Appearance.
+constexpr int kChildSpacing = 8;
+constexpr int kLabelMaskGradientWidth = 16;
+constexpr gfx::Insets kLabelMargins(0, 0, 0, /*right=*/2);
+constexpr gfx::Insets kPadding(8, 8, 8, /*right=*/10);
+constexpr int kPreferredHeight = 40;
+constexpr int kPreferredWidth = 160;
+
 // CirclePainter ---------------------------------------------------------------
 
 class CirclePainter : public views::Painter {
@@ -91,9 +100,8 @@ class HoldingSpaceItemChipView::LabelMaskLayerOwner : public ui::LayerDelegate {
     flags.setAntiAlias(false);
 
     gfx::Point gradient_end(size.width() - kHoldingSpaceIconSize, 0);
-    gfx::Point gradient_start(
-        gradient_end.x() - kHoldingSpaceChipLabelMaskGradientWidth,
-        gradient_end.y());
+    gfx::Point gradient_start(gradient_end.x() - kLabelMaskGradientWidth,
+                              gradient_end.y());
     flags.setShader(gfx::CreateGradientShader(
         gradient_start, gradient_end, SK_ColorBLACK, SK_ColorTRANSPARENT));
 
@@ -113,12 +121,11 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(
     const HoldingSpaceItem* item)
     : HoldingSpaceItemView(delegate, item) {
   auto* layout = SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kHorizontal,
-      gfx::Insets(kHoldingSpaceChipPadding), kHoldingSpaceChipChildSpacing));
+      views::BoxLayout::Orientation::kHorizontal, kPadding, kChildSpacing));
   layout->set_cross_axis_alignment(
       views::BoxLayout::CrossAxisAlignment::kCenter);
 
-  SetPreferredSize(gfx::Size(kHoldingSpaceChipWidth, kHoldingSpaceChipHeight));
+  SetPreferredSize(gfx::Size(kPreferredWidth, kPreferredHeight));
 
   image_ = AddChildView(std::make_unique<RoundedImageView>(
       kHoldingSpaceChipIconSize / 2, RoundedImageView::Alignment::kLeading));
@@ -145,6 +152,7 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(
 
   label_ = label_and_pin_button_container_->AddChildView(
       holding_space_util::CreateLabel(holding_space_util::LabelStyle::kChip));
+  label_->SetBorder(views::CreateEmptyBorder(kLabelMargins));
   label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   label_->SetHorizontalAlignment(gfx::HorizontalAlignment::ALIGN_LEFT);
   label_->SetText(item->text());

ash/system/holding_space/holding_space_item_chips_container.cc

@@ -12,6 +12,10 @@
 namespace ash {
 namespace {
 
+// Appearance.
+constexpr int kNumberOfChipsPerRow = 2;
+constexpr int kSpacing = 8;
+
 // Need a custom grid layout to facilitate removal of views from the grid,
 // which can change the number of rows required. views::GridLayout makes this
 // case difficult.
@@ -110,8 +114,8 @@ class SimpleGridLayout : public views::LayoutManagerBase {
 
 HoldingSpaceItemChipsContainer::HoldingSpaceItemChipsContainer() {
   SetLayoutManager(std::make_unique<SimpleGridLayout>(
-      kHoldingSpaceChipsPerRow, kHoldingSpaceColumnSpacing,
-      kHoldingSpaceRowSpacing));
+      kNumberOfChipsPerRow, /*column_spacing=*/kSpacing,
+      /*row_spacing=*/kSpacing));
 }
 
 HoldingSpaceItemChipsContainer::~HoldingSpaceItemChipsContainer() = default;