[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/pepper_broker_infobar_delegate.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/pepper_broker_infobar_delegate.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(GOOGLE_TV)
 #include "base/android/context_types.h"
 #endif
 
 // The URL for the "learn more" article about the PPAPI broker.
 const char kPpapiBrokerLearnMoreUrl[] =
     "https://support.google.com/chrome/?p=ib_pepper_broker";
 
@@ skipping 108 matching lines @@
       content_settings_(content_settings),
       tab_content_settings_(tab_content_settings),
       callback_(callback) {
 }
 
 PepperBrokerInfoBarDelegate::~PepperBrokerInfoBarDelegate() {
   if (!callback_.is_null())
     callback_.Run(false);
 }
 
-gfx::Image* PepperBrokerInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_PLUGIN_INSTALL);
+int PepperBrokerInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_PLUGIN_INSTALL;
 }
 
 string16 PepperBrokerInfoBarDelegate::GetMessageText() const {
   content::PluginService* plugin_service =
       content::PluginService::GetInstance();
   webkit::WebPluginInfo plugin;
   bool success = plugin_service->GetPluginInfoByPath(plugin_path_, &plugin);
   DCHECK(success);
   scoped_ptr<PluginMetadata> plugin_metadata(
       PluginFinder::GetInstance()->GetPluginMetadata(plugin));
@@ skipping 51 matching lines @@
       content::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
   callback_.Run(result);
   callback_ = base::Callback<void(bool)>();
   content_settings_->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(url_),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
       std::string(), result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
   tab_content_settings_->SetPepperBrokerAllowed(result);
 }