[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/plugins/plugin_infobar_delegates.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/plugins/plugin_infobar_delegates.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include "ui/base/win/shell.h"
 #endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #endif
@@ skipping 31 matching lines @@
 void PluginInfoBarDelegate::LoadBlockedPlugins() {
   if (web_contents()) {
     content::RenderViewHost* host = web_contents()->GetRenderViewHost();
     ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
         host->GetProcess()->GetID());
     host->Send(new ChromeViewMsg_LoadBlockedPlugins(
         host->GetRoutingID(), identifier_));
   }
 }
 
-gfx::Image* PluginInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_PLUGIN_INSTALL);
+int PluginInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_PLUGIN_INSTALL;
 }
 
 string16 PluginInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 
 // UnauthorizedPluginInfoBarDelegate ------------------------------------------
 
 // static
@@ skipping 294 matching lines @@
       WeakPluginInstallerObserver(installer),
       plugin_metadata_(plugin_metadata.Pass()),
       callback_(callback),
       new_install_(new_install),
       message_(message) {
 }
 
 PluginInstallerInfoBarDelegate::~PluginInstallerInfoBarDelegate() {
 }
 
-gfx::Image* PluginInstallerInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_PLUGIN_INSTALL);
+int PluginInstallerInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_PLUGIN_INSTALL;
 }
 
 string16 PluginInstallerInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
 int PluginInstallerInfoBarDelegate::GetButtons() const {
   return callback_.is_null() ? BUTTON_NONE : BUTTON_OK;
 }
 
@@ skipping 88 matching lines @@
     PluginMetroModeInfoBarDelegate::Mode mode,
     const string16& name)
     : ConfirmInfoBarDelegate(infobar_service),
       mode_(mode),
       name_(name) {
 }
 
 PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
 }
 
-gfx::Image* PluginMetroModeInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_PLUGIN_INSTALL);
+int PluginMetroModeInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_PLUGIN_INSTALL;
 }
 
 string16 PluginMetroModeInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16((mode_ == MISSING_PLUGIN) ?
       IDS_METRO_MISSING_PLUGIN_PROMPT : IDS_METRO_NPAPI_PLUGIN_PROMPT, name_);
 }
 
 int PluginMetroModeInfoBarDelegate::GetButtons() const {
   return (mode_ == MISSING_PLUGIN) ? BUTTON_OK : (BUTTON_OK | BUTTON_CANCEL);
 }
@@ skipping 40 matching lines @@
       Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   web_contents()->OpenURL(params);
   return false;
 }
 
 #endif  // defined(OS_WIN)
 
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)