diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 01c533ba428976..2fe44998581d6c 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -543,7 +543,7 @@ void FindBarView::InitViewsForMaterial() { } button_images[] = { {find_previous_button_, gfx::VectorIconId::FIND_PREV}, {find_next_button_, gfx::VectorIconId::FIND_NEXT}, - {close_button_, gfx::VectorIconId::FIND_CLOSE}, + {close_button_, gfx::VectorIconId::BAR_CLOSE}, }; SkColor grey; diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index d489e198f9705d..050092b5bf971a 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -21,6 +21,10 @@ #include "ui/compositor/clip_transform_recorder.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/paint_vector_icon.h" +#include "ui/gfx/vector_icons_public.h" +#include "ui/native_theme/common_theme.h" +#include "ui/native_theme/native_theme.h" #include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/label_button.h" @@ -218,13 +222,23 @@ void InfoBarView::ViewHierarchyChanged( } close_button_ = new views::ImageButton(this); - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - close_button_->SetImage(views::CustomButton::STATE_NORMAL, - rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia()); - close_button_->SetImage(views::CustomButton::STATE_HOVERED, - rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia()); - close_button_->SetImage(views::CustomButton::STATE_PRESSED, - rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia()); + + if (ui::MaterialDesignController::IsModeMaterial()) { + SkColor grey; + ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_ChromeIconGrey, + &grey); + gfx::ImageSkia image = + gfx::CreateVectorIcon(gfx::VectorIconId::BAR_CLOSE, 16, grey); + close_button_->SetImage(views::CustomButton::STATE_NORMAL, &image); + } else { + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); + close_button_->SetImage(views::CustomButton::STATE_NORMAL, + rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia()); + close_button_->SetImage(views::CustomButton::STATE_HOVERED, + rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia()); + close_button_->SetImage(views::CustomButton::STATE_PRESSED, + rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia()); + } close_button_->SizeToPreferredSize(); close_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn index fd76f4ab1d0353..311ec1ff320c7e 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -423,6 +423,8 @@ action("aggregate_vector_icons") { "vector_icons/account_child_invert.icon", "vector_icons/apps.icon", "vector_icons/autofill.icon", + "vector_icons/bar_close.1x.icon", + "vector_icons/bar_close.icon", "vector_icons/blocked_badge.icon", "vector_icons/check_circle.icon", "vector_icons/code.icon", @@ -430,8 +432,6 @@ action("aggregate_vector_icons") { "vector_icons/extension.icon", "vector_icons/file_download.icon", "vector_icons/file_download_shelf.icon", - "vector_icons/find_close.1x.icon", - "vector_icons/find_close.icon", "vector_icons/find_next.1x.icon", "vector_icons/find_next.icon", "vector_icons/find_prev.1x.icon", diff --git a/ui/gfx/vector_icons/find_close.1x.icon b/ui/gfx/vector_icons/bar_close.1x.icon similarity index 100% rename from ui/gfx/vector_icons/find_close.1x.icon rename to ui/gfx/vector_icons/bar_close.1x.icon diff --git a/ui/gfx/vector_icons/find_close.icon b/ui/gfx/vector_icons/bar_close.icon similarity index 100% rename from ui/gfx/vector_icons/find_close.icon rename to ui/gfx/vector_icons/bar_close.icon