Vectorize several infobar icons.

Some infobars are not used on desktop and these are not updated (e.g. media_stream, save_password, download_request, geolocation and others in permission_queue_controller). Unfortunately some of them are still compiled on desktop although they should not be.

Some infobars are not updated simply because this patch is already large and unwieldy.

This is controlled by the --top-chrome-md flag.

BUG=505953

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

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

28 files changed, 361 insertions, 12 deletions

diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
index 693180a..a3cd0bc 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
@@ -16,6 +16,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/vector_icons_public.h"
 
 namespace banners {
 
@@ -60,6 +61,14 @@ int AppBannerInfoBarDelegateDesktop::GetIconID() const {
   return IDR_INFOBAR_APP_BANNER;
 }
 
+gfx::VectorIconId AppBannerInfoBarDelegateDesktop::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::APPS;
+#endif
+}
+
 base::string16 AppBannerInfoBarDelegateDesktop::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_ADD_TO_SHELF_INFOBAR_TITLE);
 }
diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
index a2f9df9..37204f6 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
@@ -65,6 +65,7 @@ class AppBannerInfoBarDelegateDesktop : public ConfirmInfoBarDelegate {
 
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarDelegateDesktop);
 };
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 6bad4e8..9ac4172 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -22,7 +22,7 @@
 #include "extensions/common/extension.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-
+#include "ui/gfx/vector_icons_public.h"
 
 // static
 void ThemeInstalledInfoBarDelegate::Create(
@@ -109,11 +109,17 @@ ThemeInstalledInfoBarDelegate::GetInfoBarType() const {
 }
 
 int ThemeInstalledInfoBarDelegate::GetIconID() const {
-  // TODO(aa): Reply with the theme's icon, but this requires reading it
-  // asynchronously from disk.
   return IDR_INFOBAR_THEME;
 }
 
+gfx::VectorIconId ThemeInstalledInfoBarDelegate::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::PAINTBRUSH;
+#endif
+}
+
 ThemeInstalledInfoBarDelegate*
     ThemeInstalledInfoBarDelegate::AsThemePreviewInfobarDelegate() {
   return this;
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index 917a824..bb538b5 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -44,6 +44,7 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate,
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
   ThemeInstalledInfoBarDelegate* AsThemePreviewInfobarDelegate() override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc
index 216e0ec..e937aa8 100644
--- a/chrome/browser/resources_util_unittest.cc
+++ b/chrome/browser/resources_util_unittest.cc
@@ -18,7 +18,7 @@ TEST(ResourcesUtil, SpotCheckIds) {
     int id;
   } kCases[] = {
     // IDRs from chrome/app/theme/theme_resources.grd should be valid.
-    {"IDR_INFOBAR_COOKIE", IDR_INFOBAR_COOKIE},
+    {"IDR_ERROR_NETWORK_GENERIC", IDR_ERROR_NETWORK_GENERIC},
     {"IDR_PAGEINFO_BAD", IDR_PAGEINFO_BAD},
     // IDRs from ui/resources/ui_resources.grd should be valid.
     {"IDR_FOLDER_CLOSED", IDR_FOLDER_CLOSED},
diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.cc b/chrome/browser/ui/collected_cookies_infobar_delegate.cc
index 06b6989..a8b5647 100644
--- a/chrome/browser/ui/collected_cookies_infobar_delegate.cc
+++ b/chrome/browser/ui/collected_cookies_infobar_delegate.cc
@@ -11,7 +11,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-
+#include "ui/gfx/vector_icons_public.h"
 
 // static
 void CollectedCookiesInfoBarDelegate::Create(InfoBarService* infobar_service) {
@@ -36,6 +36,14 @@ int CollectedCookiesInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_COOKIE;
 }
 
+gfx::VectorIconId CollectedCookiesInfoBarDelegate::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::COOKIE;
+#endif
+}
+
 base::string16 CollectedCookiesInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_INFOBAR_MESSAGE);
 }
diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.h b/chrome/browser/ui/collected_cookies_infobar_delegate.h
index d00a4ca..c60e73f 100644
--- a/chrome/browser/ui/collected_cookies_infobar_delegate.h
+++ b/chrome/browser/ui/collected_cookies_infobar_delegate.h
@@ -27,6 +27,7 @@ class CollectedCookiesInfoBarDelegate : public ConfirmInfoBarDelegate {
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
index b18c804..d2b2fbb 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
@@ -16,7 +16,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-
+#include "ui/gfx/vector_icons_public.h"
 
 AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() {
 }
@@ -101,3 +101,11 @@ AlternateNavInfoBarDelegate::GetInfoBarType() const {
 int AlternateNavInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_ALT_NAV_URL;
 }
+
+gfx::VectorIconId AlternateNavInfoBarDelegate::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::GLOBE;
+#endif
+}
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
index 808c687..1baee1d 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
@@ -43,6 +43,7 @@ class AlternateNavInfoBarDelegate : public infobars::InfoBarDelegate {
   // InfoBarDelegate:
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
 
   Profile* profile_;
   const base::string16 text_;
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc
index b68ba8e..4502d8d 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc
@@ -19,7 +19,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-
+#include "ui/gfx/vector_icons_public.h"
 
 // static
 void SessionCrashedInfoBarDelegate::Create(Browser* browser) {
@@ -59,6 +59,14 @@ int SessionCrashedInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_RESTORE_SESSION;
 }
 
+gfx::VectorIconId SessionCrashedInfoBarDelegate::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::SAD_TAB;
+#endif
+}
+
 base::string16 SessionCrashedInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE);
 }
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
index 153c3f7..a7cc568 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
@@ -23,6 +23,7 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
 
   // ConfirmInfoBarDelegate:
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 4cf012c..d307f4c 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -28,7 +28,6 @@
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
-#include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ -57,6 +56,10 @@
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h"
+#endif
+
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
@@ -322,6 +325,9 @@ void WebsiteSettings::OnSiteDataAccessed() {
 }
 
 void WebsiteSettings::OnUIClosing() {
+#if defined(OS_ANDROID)
+  NOTREACHED();
+#else
   if (show_info_bar_ && web_contents_) {
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents_);
@@ -336,6 +342,7 @@ void WebsiteSettings::OnUIClosing() {
   UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.did_user_revoke_decisions",
                             user_decision,
                             END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM);
+#endif
 }
 
 void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() {
diff --git a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
index 77b2a41..fe8d0a5 100644
--- a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
+++ b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
@@ -12,7 +12,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-
+#include "ui/gfx/vector_icons_public.h"
 
 // static
 void WebsiteSettingsInfoBarDelegate::Create(InfoBarService* infobar_service) {
@@ -37,6 +37,14 @@ int WebsiteSettingsInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_ALT_NAV_URL;
 }
 
+gfx::VectorIconId WebsiteSettingsInfoBarDelegate::GetVectorIconId() const {
+#if defined(OS_MACOSX)
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#else
+  return gfx::VectorIconId::GLOBE;
+#endif
+}
+
 base::string16 WebsiteSettingsInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INFOBAR_TEXT);
 }
diff --git a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
index d714a70..e506139 100644
--- a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
+++ b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
@@ -27,6 +27,7 @@ class WebsiteSettingsInfoBarDelegate : public ConfirmInfoBarDelegate {
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index c3952c2..9e1b3df 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -404,6 +404,7 @@ TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
   EXPECT_EQ(base::string16(), website_settings()->organization_name());
 }
 
+#if !defined(OS_ANDROID)
 TEST_F(WebsiteSettingsTest, NoInfoBar) {
   SetDefaultUIExpectations(mock_ui());
   EXPECT_CALL(*mock_ui(), SetSelectedTab(
@@ -437,6 +438,7 @@ TEST_F(WebsiteSettingsTest, ShowInfoBar) {
 
   infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0));
 }
+#endif
 
 TEST_F(WebsiteSettingsTest, AboutBlankPage) {
   SetURL("about:blank");
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 8a2fe98..20c6d0f 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -284,8 +284,6 @@
       'browser/ui/website_settings/permission_bubble_view.h',
       'browser/ui/website_settings/website_settings.cc',
       'browser/ui/website_settings/website_settings.h',
-      'browser/ui/website_settings/website_settings_infobar_delegate.cc',
-      'browser/ui/website_settings/website_settings_infobar_delegate.h',
       'browser/ui/website_settings/website_settings_ui.cc',
       'browser/ui/website_settings/website_settings_ui.h',
       'browser/ui/webui/about_ui.cc',
@@ -1727,6 +1725,8 @@
       'browser/ui/unload_controller.h',
       'browser/ui/website_settings/permission_menu_model.cc',
       'browser/ui/website_settings/permission_menu_model.h',
+      'browser/ui/website_settings/website_settings_infobar_delegate.cc',
+      'browser/ui/website_settings/website_settings_infobar_delegate.h',
       'browser/ui/website_settings/website_settings_utils.cc',
       'browser/ui/website_settings/website_settings_utils.h',
       'browser/ui/webui/app_launcher_login_handler.cc',
diff --git a/components/autofill/core/browser/autofill_cc_infobar_delegate.cc b/components/autofill/core/browser/autofill_cc_infobar_delegate.cc
index 7dc13a7..bbccefa 100644
--- a/components/autofill/core/browser/autofill_cc_infobar_delegate.cc
+++ b/components/autofill/core/browser/autofill_cc_infobar_delegate.cc
@@ -14,6 +14,7 @@
 #include "grit/components_scaled_resources.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "url/gurl.h"
 
 namespace autofill {
@@ -60,6 +61,14 @@ int AutofillCCInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_AUTOFILL_CC;
 }
 
+gfx::VectorIconId AutofillCCInfoBarDelegate::GetVectorIconId() const {
+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_ANDROID)
+  return gfx::VectorIconId::AUTOFILL;
+#else
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+#endif
+}
+
 bool AutofillCCInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   // The user has submitted a form, causing the page to navigate elsewhere. We
diff --git a/components/autofill/core/browser/autofill_cc_infobar_delegate.h b/components/autofill/core/browser/autofill_cc_infobar_delegate.h
index 911e8ba..5d9e7f7 100644
--- a/components/autofill/core/browser/autofill_cc_infobar_delegate.h
+++ b/components/autofill/core/browser/autofill_cc_infobar_delegate.h
@@ -51,6 +51,7 @@ class AutofillCCInfoBarDelegate : public ConfirmInfoBarDelegate {
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   int GetIconID() const override;
+  gfx::VectorIconId GetVectorIconId() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
   void InfoBarDismissed() override;
   base::string16 GetMessageText() const override;
diff --git a/components/infobars.gypi b/components/infobars.gypi
index 449082c..8c2449c 100644
--- a/components/infobars.gypi
+++ b/components/infobars.gypi
@@ -38,6 +38,14 @@
         'infobars/core/simple_alert_infobar_delegate.cc',
         'infobars/core/simple_alert_infobar_delegate.h',
       ],
+      'conditions': [
+        ['OS != "ios" and OS != "android"', {
+          'dependencies': [
+            '../ui/gfx/gfx.gyp:gfx_vector_icons',
+            '../ui/native_theme/native_theme.gyp:native_theme',
+          ],
+        }],
+      ],
     },
   ],
 }
diff --git a/components/infobars/core/BUILD.gn b/components/infobars/core/BUILD.gn
index 79e658f..d4cb5e1 100644
--- a/components/infobars/core/BUILD.gn
+++ b/components/infobars/core/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
+
 static_library("core") {
   sources = [
     "confirm_infobar_delegate.cc",
@@ -29,4 +31,8 @@ static_library("core") {
     "//ui/gfx",
     "//ui/strings",
   ]
+
+  if (use_aura || (!is_ios && !is_android)) {
+    deps += [ "//ui/native_theme" ]
+  }
 }
diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc
index 4389240..3cd667d 100644
--- a/components/infobars/core/infobar_delegate.cc
+++ b/components/infobars/core/infobar_delegate.cc
@@ -8,7 +8,15 @@
 #include "build/build_config.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/vector_icons_public.h"
+
+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_ANDROID)
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/native_theme/common_theme.h"
+#include "ui/native_theme/native_theme.h"
+#endif
 
 namespace infobars {
 
@@ -30,9 +38,29 @@ int InfoBarDelegate::GetIconID() const {
   return kNoIconID;
 }
 
+gfx::VectorIconId InfoBarDelegate::GetVectorIconId() const {
+  return gfx::VectorIconId::VECTOR_ICON_NONE;
+}
+
 gfx::Image InfoBarDelegate::GetIcon() const {
+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_ANDROID)
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    gfx::VectorIconId vector_id = GetVectorIconId();
+    if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
+      SkColor icon_color;
+      if (GetInfoBarType() == WARNING_TYPE) {
+        icon_color = SkColorSetRGB(0xFF, 0x6F, 0x00);
+      } else {
+        ui::CommonThemeGetSystemColor(ui::NativeTheme::kColorId_GoogleBlue,
+                                      &icon_color);
+      }
+      return gfx::Image(gfx::CreateVectorIcon(vector_id, 16, icon_color));
+    }
+  }
+#endif
+
   int icon_id = GetIconID();
-  return (icon_id == kNoIconID) ? gfx::Image() :
+  return icon_id == kNoIconID ? gfx::Image() :
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(icon_id);
 }
 
diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index 94dc81b..32cced6 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -26,6 +26,7 @@ class TranslateInfoBarDelegate;
 
 namespace gfx {
 class Image;
+enum class VectorIconId;
 }
 
 namespace infobars {
@@ -83,6 +84,11 @@ class InfoBarDelegate {
   // value is equal to |kNoIconID|, GetIcon() will not show an icon by default.
   virtual int GetIconID() const;
 
+  // Returns the vector icon identifier to be shown for this InfoBar. This will
+  // take precedent over GetIconID() (although typically only one of the two
+  // should be defined for any given infobar).
+  virtual gfx::VectorIconId GetVectorIconId() const;
+
   // Returns the icon to be shown for this InfoBar. If the returned Image is
   // empty, no icon is shown.
   //
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 3131abe..36b1ca1 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -421,6 +421,8 @@ action("aggregate_vector_icons") {
     "vector_icon_types.h",
     "vector_icons/account_box.icon",
     "vector_icons/account_child_invert.icon",
+    "vector_icons/apps.icon",
+    "vector_icons/autofill.icon",
     "vector_icons/blocked_badge.icon",
     "vector_icons/check_circle.icon",
     "vector_icons/code.icon",
@@ -438,6 +440,7 @@ action("aggregate_vector_icons") {
     "vector_icons/folder_managed.icon",
     "vector_icons/folder_supervised.icon",
     "vector_icons/fullscreen.icon",
+    "vector_icons/globe.icon",
     "vector_icons/help_outline.icon",
     "vector_icons/image.icon",
     "vector_icons/laptop.icon",
@@ -447,8 +450,10 @@ action("aggregate_vector_icons") {
     "vector_icons/mode_edit.icon",
     "vector_icons/my_location.icon",
     "vector_icons/notifications.icon",
+    "vector_icons/paintbrush.icon",
     "vector_icons/photo_camera.icon",
     "vector_icons/remove_box.icon",
+    "vector_icons/sad_tab.icon",
     "vector_icons/smartphone.icon",
     "vector_icons/supervisor_account.icon",
     "vector_icons/tab.icon",
diff --git a/ui/gfx/vector_icons/apps.icon b/ui/gfx/vector_icons/apps.icon
new file mode 100644
index 0000000..f70955f
--- /dev/null
+++ b/ui/gfx/vector_icons/apps.icon
@@ -0,0 +1,59 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+MOVE_TO, 8, 16,
+R_H_LINE_TO, 8,
+V_LINE_TO, 8,
+H_LINE_TO, 8,
+R_V_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 12, 24,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+R_H_LINE_TO, -8,
+R_V_LINE_TO, 8,
+CLOSE,
+MOVE_TO, 8, 40,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+H_LINE_TO, 8,
+R_V_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 0, -12,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+H_LINE_TO, 8,
+R_V_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 12, 0,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+R_H_LINE_TO, -8,
+R_V_LINE_TO, 8,
+CLOSE,
+MOVE_TO, 32, 8,
+R_V_LINE_TO, 8,
+R_H_LINE_TO, 8,
+V_LINE_TO, 8,
+R_H_LINE_TO, -8,
+CLOSE,
+R_MOVE_TO, -12, 8,
+R_H_LINE_TO, 8,
+V_LINE_TO, 8,
+R_H_LINE_TO, -8,
+R_V_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 12, 12,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+R_H_LINE_TO, -8,
+R_V_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 0, 12,
+R_H_LINE_TO, 8,
+R_V_LINE_TO, -8,
+R_H_LINE_TO, -8,
+R_V_LINE_TO, 8,
+CLOSE,
+END
diff --git a/ui/gfx/vector_icons/autofill.icon b/ui/gfx/vector_icons/autofill.icon
new file mode 100644
index 0000000..8113350
--- /dev/null
+++ b/ui/gfx/vector_icons/autofill.icon
@@ -0,0 +1,29 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+MOVE_TO, 6, 34.5f,
+LINE_TO, 6, 42,
+LINE_TO, 13.5f, 42,
+LINE_TO, 35.63f, 19.87f,
+LINE_TO, 28.13f, 12.37f,
+LINE_TO, 6, 34.5f,
+LINE_TO, 6, 34.5f,
+CLOSE,
+MOVE_TO, 41.41f, 14.09f,
+CUBIC_TO, 42.2f, 13.3f, 42.2f, 12.04f, 41.41f, 11.26f,
+LINE_TO, 36.74f, 6.59f,
+CUBIC_TO, 35.96f, 5.8f, 34.7f, 5.8f, 33.91f, 6.59f,
+LINE_TO, 30.25f, 10.25f,
+LINE_TO, 37.75f, 17.75f,
+LINE_TO, 41.41f, 14.09f,
+LINE_TO, 41.41f, 14.09f,
+CLOSE,
+MOVE_TO, 24, 38,
+LINE_TO, 20, 42,
+LINE_TO, 42, 42,
+LINE_TO, 42, 38,
+LINE_TO, 24, 38,
+LINE_TO, 24, 38,
+CLOSE,
+END
diff --git a/ui/gfx/vector_icons/globe.icon b/ui/gfx/vector_icons/globe.icon
new file mode 100644
index 0000000..858c2f3
--- /dev/null
+++ b/ui/gfx/vector_icons/globe.icon
@@ -0,0 +1,49 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+MOVE_TO, 24, 4,
+CUBIC_TO, 12.95f, 4, 4, 12.95f, 4, 24,
+CUBIC_TO, 4, 35.05f, 12.95f, 44, 24, 44,
+CUBIC_TO, 35.05f, 44, 44, 35.05f, 44, 24,
+CUBIC_TO, 44, 12.95f, 35.05f, 4, 24, 4,
+LINE_TO, 24, 4,
+CLOSE,
+MOVE_TO, 32.51f, 36.76f,
+LINE_TO, 32.51f, 32.89f,
+CUBIC_TO, 32.51f, 31.8f, 31.4f, 30.67f, 30.32f, 30.67f,
+CUBIC_TO, 30.32f, 29.58f, 29.21f, 28.44f, 28.14f, 28.44f,
+LINE_TO, 23.76f, 28.44f,
+CUBIC_TO, 23.22f, 28.44f, 22.68f, 28.73f, 22.26f, 29.15f,
+LINE_TO, 19.38f, 26.22f,
+LINE_TO, 19.38f, 25.11f,
+CUBIC_TO, 19.38f, 24.5f, 19.87f, 24, 20.48f, 24,
+LINE_TO, 21.57f, 24,
+CUBIC_TO, 22.78f, 24, 23.76f, 23, 23.76f, 21.78f,
+LINE_TO, 23.76f, 15.11f,
+CUBIC_TO, 24.97f, 15.11f, 25.95f, 14.12f, 25.95f, 12.89f,
+CUBIC_TO, 25.95f, 11.66f, 24.97f, 10.67f, 23.76f, 10.67f,
+CUBIC_TO, 16.51f, 10.67f, 10.63f, 16.64f, 10.63f, 24,
+CUBIC_TO, 10.63f, 25.23f, 11.61f, 26.22f, 12.82f, 26.22f,
+LINE_TO, 15.01f, 26.22f,
+LINE_TO, 21.57f, 32.89f,
+LINE_TO, 21.57f, 36.22f,
+CUBIC_TO, 21.57f, 36.84f, 22.06f, 37.33f, 22.67f, 37.33f,
+LINE_TO, 23.76f, 37.33f,
+LINE_TO, 23.76f, 39.56f,
+CUBIC_TO, 15.3f, 39.56f, 8.44f, 32.59f, 8.44f, 24,
+CUBIC_TO, 8.44f, 15.41f, 15.3f, 8.44f, 23.76f, 8.44f,
+CUBIC_TO, 28.96f, 8.44f, 33.55f, 11.08f, 36.32f, 15.11f,
+LINE_TO, 34.7f, 15.11f,
+CUBIC_TO, 33.49f, 15.11f, 32.51f, 16.11f, 32.51f, 17.33f,
+LINE_TO, 32.51f, 19.56f,
+CUBIC_TO, 32.51f, 20.78f, 33.49f, 21.78f, 34.7f, 21.78f,
+LINE_TO, 34.82f, 21.78f,
+CUBIC_TO, 34.75f, 22.02f, 34.7f, 22.26f, 34.7f, 22.52f,
+LINE_TO, 34.7f, 25.48f,
+CUBIC_TO, 34.7f, 27.12f, 36.17f, 28.44f, 37.98f, 28.44f,
+CUBIC_TO, 38.14f, 28.44f, 38.29f, 28.42f, 38.44f, 28.4f,
+CUBIC_TO, 37.45f, 31.83f, 35.33f, 34.76f, 32.51f, 36.76f,
+LINE_TO, 32.51f, 36.76f,
+CLOSE,
+END
diff --git a/ui/gfx/vector_icons/paintbrush.icon b/ui/gfx/vector_icons/paintbrush.icon
new file mode 100644
index 0000000..9b7b2a6
--- /dev/null
+++ b/ui/gfx/vector_icons/paintbrush.icon
@@ -0,0 +1,39 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+MOVE_TO, 19.08f, 26.09f,
+LINE_TO, 27.77f, 34.8f,
+LINE_TO, 30.66f, 31.9f,
+CUBIC_TO, 31.46f, 31.09f, 30.66f, 28.99f, 30.66f, 28.99f,
+LINE_TO, 29.22f, 24.63f,
+CUBIC_TO, 28.85f, 23.54f, 28.78f, 22.17f, 29.22f, 21.73f,
+CUBIC_TO, 33.56f, 17.37f, 39.35f, 14.47f, 40.8f, 13.01f,
+CUBIC_TO, 42.4f, 11.41f, 42.4f, 8.81f, 40.8f, 7.2f,
+CUBIC_TO, 39.2f, 5.6f, 36.61f, 5.6f, 35.01f, 7.2f,
+CUBIC_TO, 33.56f, 8.66f, 30.66f, 14.47f, 26.32f, 18.82f,
+CUBIC_TO, 25.89f, 19.26f, 24.51f, 19.19f, 23.42f, 18.82f,
+LINE_TO, 19.08f, 17.37f,
+CUBIC_TO, 19.08f, 17.37f, 16.98f, 16.57f, 16.19f, 17.37f,
+LINE_TO, 13.29f, 20.28f,
+LINE_TO, 19.08f, 26.09f,
+LINE_TO, 19.08f, 26.09f,
+CLOSE,
+MOVE_TO, 39.35f, 8.66f,
+CUBIC_TO, 40.15f, 9.46f, 40.15f, 10.77f, 39.35f, 11.57f,
+CUBIC_TO, 38.55f, 12.37f, 37.25f, 12.37f, 36.45f, 11.57f,
+CUBIC_TO, 35.65f, 10.77f, 35.65f, 9.46f, 36.45f, 8.66f,
+CUBIC_TO, 37.25f, 7.86f, 38.55f, 7.86f, 39.35f, 8.66f,
+LINE_TO, 39.35f, 8.66f,
+CLOSE,
+MOVE_TO, 13.8f, 35.83f,
+LINE_TO, 17.9f, 35.83f,
+LINE_TO, 17.9f, 39.94f,
+LINE_TO, 19.95f, 42,
+LINE_TO, 26.11f, 35.83f,
+LINE_TO, 11.75f, 21.43f,
+LINE_TO, 5.6f, 27.6f,
+LINE_TO, 13.8f, 35.83f,
+LINE_TO, 13.8f, 35.83f,
+CLOSE,
+END
diff --git a/ui/gfx/vector_icons/sad_tab.icon b/ui/gfx/vector_icons/sad_tab.icon
new file mode 100644
index 0000000..6876aca
--- /dev/null
+++ b/ui/gfx/vector_icons/sad_tab.icon
@@ -0,0 +1,48 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+MOVE_TO, 38, 13,
+LINE_TO, 21, 13,
+LINE_TO, 17, 7,
+LINE_TO, 10, 7,
+CUBIC_TO, 7.7f, 7, 6.02f, 8.69f, 6, 11,
+LINE_TO, 6, 37,
+CUBIC_TO, 6, 39.31f, 7.7f, 41, 10, 41,
+LINE_TO, 38, 41,
+CUBIC_TO, 40.3f, 41, 42, 39.31f, 42, 37,
+LINE_TO, 42, 17,
+CUBIC_TO, 42, 14.36f, 40.3f, 12.67f, 38, 13,
+LINE_TO, 38, 13,
+LINE_TO, 38, 13,
+CLOSE,
+MOVE_TO, 16, 18,
+LINE_TO, 20, 18,
+LINE_TO, 20, 23,
+LINE_TO, 16, 23,
+LINE_TO, 16, 18,
+LINE_TO, 16, 18,
+CLOSE,
+MOVE_TO, 33, 35,
+LINE_TO, 29, 35,
+LINE_TO, 29, 31,
+LINE_TO, 20, 31,
+LINE_TO, 20, 35,
+LINE_TO, 16, 35,
+LINE_TO, 16, 31,
+LINE_TO, 20, 31,
+LINE_TO, 20, 27,
+LINE_TO, 29, 27,
+LINE_TO, 29, 31,
+LINE_TO, 33, 31,
+LINE_TO, 33, 35,
+LINE_TO, 33, 35,
+CLOSE,
+MOVE_TO, 28, 18,
+LINE_TO, 32, 18,
+LINE_TO, 32, 23,
+LINE_TO, 28, 23,
+LINE_TO, 28, 18,
+LINE_TO, 28, 18,
+CLOSE,
+END