[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/startup/autolaunch_prompt_win.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/startup/autolaunch_prompt.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/auto_launch_util.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
 
 
 // AutolaunchInfoBarDelegate --------------------------------------------------
 
 namespace {
 
 // The delegate for the infobar shown when Chrome was auto-launched.
 class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates an autolaunch delegate and adds it to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      PrefService* prefs,
                      Profile* profile);
 
  private:
   AutolaunchInfoBarDelegate(InfoBarService* infobar_service,
                             PrefService* prefs,
                             Profile* profile);
   virtual ~AutolaunchInfoBarDelegate();
 
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
-  virtual gfx::Image* GetIcon() const OVERRIDE;
+  virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const OVERRIDE;
 
   // The prefs to use.
   PrefService* prefs_;
 
@@ skipping 34 matching lines @@
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AutolaunchInfoBarDelegate::AllowExpiry,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(8));
 }
 
 AutolaunchInfoBarDelegate::~AutolaunchInfoBarDelegate() {
 }
 
-gfx::Image* AutolaunchInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_PRODUCT_LOGO_32);
+int AutolaunchInfoBarDelegate::GetIconID() const {
+  return IDR_PRODUCT_LOGO_32;
 }
 
 string16 AutolaunchInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_AUTO_LAUNCH_INFOBAR_TEXT);
 }
 
 string16 AutolaunchInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
       IDS_AUTO_LAUNCH_OK : IDS_AUTO_LAUNCH_REVERT);
@@ skipping 59 matching lines @@
 }
 
 void RegisterAutolaunchUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kShownAutoLaunchInfobar,
       0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace chrome