Infobar MD refresh: close button.

For now, like the find bar, there is no hover or pressed state (see crbug.com/523356)

BUG=520266
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/1322583006

Cr-Commit-Position: refs/heads/master@{#347769}

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;

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));

ui/gfx/BUILD.gn

@@ -423,15 +423,15 @@ 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",
     "vector_icons/cookie.icon",
     "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",