[Multipaste] Change the button style

Bug: 1112888
Change-Id: Ia3707fa7f5889bde4c8fa503660563af41b819d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2381059Reviewed-by: David Black <dmblack@google.com>
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802820}

ash/clipboard/views/clipboard_history_bitmap_item_view.cc

@@ -8,6 +8,7 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/view_class_properties.h"
 
 namespace {
 
@@ -46,7 +47,7 @@ class ClipboardHistoryBitmapItemView::BitmapContentsView
 
     auto delete_button = std::make_unique<DeleteButton>(container_);
     delete_button->SetVisible(false);
-    delete_button->SetBorder(views::CreateEmptyBorder(kDeleteButtonMargins));
+    delete_button->SetProperty(views::kMarginsKey, kDeleteButtonMargins);
     DeleteButton* delete_button_ptr =
         delete_button_container->AddChildView(std::move(delete_button));
     AddChildView(std::move(delete_button_container));

ash/clipboard/views/clipboard_history_item_view.cc

@@ -9,6 +9,7 @@
 #include "ash/clipboard/views/clipboard_history_bitmap_item_view.h"
 #include "ash/clipboard/views/clipboard_history_text_item_view.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/style/ash_color_provider.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard_data.h"
 #include "ui/gfx/canvas.h"
@@ -114,13 +115,16 @@ bool ClipboardHistoryItemView::ContentsView::DoesIntersectRect(
 ClipboardHistoryItemView::DeleteButton::DeleteButton(
     views::ButtonListener* listener)
     : views::ImageButton(listener) {
-  const gfx::ImageSkia icon_image =
-      gfx::CreateVectorIcon(kDeleteIcon, kDeleteButtonSizeDip, SK_ColorBLACK);
-  SetImage(views::ImageButton::STATE_NORMAL, icon_image);
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   SetAccessibleName(base::ASCIIToUTF16(std::string(GetClassName())));
   SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
   SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
+  SetPreferredSize(gfx::Size(kDeleteButtonSizeDip, kDeleteButtonSizeDip));
+
+  AshColorProvider::Get()->DecorateCloseButton(
+      this, AshColorProvider::ButtonType::kCloseButtonWithSmallBase,
+      AshColorProvider::AshColorMode::kDark, kDeleteButtonSizeDip,
+      kCloseButtonIcon);
 }
 
 ClipboardHistoryItemView::DeleteButton::~DeleteButton() = default;

ash/clipboard/views/clipboard_history_text_item_view.cc

@@ -41,7 +41,7 @@ class ClipboardHistoryTextItemView::TextContentsView
   DeleteButton* CreateDeleteButton() override {
     auto delete_button = std::make_unique<DeleteButton>(container_);
     delete_button->SetVisible(false);
-    delete_button->SetBorder(views::CreateEmptyBorder(kDeleteButtonMargins));
+    delete_button->SetProperty(views::kMarginsKey, kDeleteButtonMargins);
     return AddChildView(std::move(delete_button));
   }