[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/hung_plugin_tab_helper.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/ui/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.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 "base/win/scoped_handle.h"
 #include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
 #endif
 
 
 namespace {
 
 #if defined(OS_WIN)
@@ skipping 97 matching lines @@
                                            const string16& plugin_name);
 
  private:
   HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
                             InfoBarService* infobar_service,
                             int plugin_child_id,
                             const string16& plugin_name);
   virtual ~HungPluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual gfx::Image* GetIcon() const OVERRIDE;
+  virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
 
   string16 message_;
   string16 button_text_;
-  gfx::Image* icon_;
 };
 
 // static
 HungPluginInfoBarDelegate* HungPluginInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     HungPluginTabHelper* helper,
     int plugin_child_id,
     const string16& plugin_name) {
   return static_cast<HungPluginInfoBarDelegate*>(infobar_service->AddInfoBar(
       scoped_ptr<InfoBarDelegate>(new HungPluginInfoBarDelegate(
           helper, infobar_service, plugin_child_id, plugin_name))));
 }
 
 HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
     HungPluginTabHelper* helper,
     InfoBarService* infobar_service,
     int plugin_child_id,
     const string16& plugin_name)
     : ConfirmInfoBarDelegate(infobar_service),
       helper_(helper),
       plugin_child_id_(plugin_child_id) {
   message_ = l10n_util::GetStringFUTF16(IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR,
                                         plugin_name);
   button_text_ = l10n_util::GetStringUTF16(
       IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON);
-  icon_ = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_PLUGIN_CRASHED);
 }
 
 HungPluginInfoBarDelegate::~HungPluginInfoBarDelegate() {
 }
 
-gfx::Image* HungPluginInfoBarDelegate::GetIcon() const {
-  return icon_;
+int HungPluginInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_PLUGIN_CRASHED;
 }
 
 string16 HungPluginInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
 int HungPluginInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
@@ skipping 232 matching lines @@
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   if (state->info_bar) {
     infobar_service->RemoveInfoBar(state->info_bar);
     state->info_bar = NULL;
   }
 }