[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.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::NavigationController;
 using content::NavigationEntry;
 
 
 // HintInfoBarDelegate ---------------------------------------------------------
 
 class HintInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // If the active entry for |web_contents| is a navigation to the user's
   // default search engine, and the engine is on a small whitelist, creates a
   // "you can search from the omnibox" hint delegate and adds it to the
   // InfoBarService for |web_contents|.
   static void Create(content::WebContents* web_contents,
                      OmniboxSearchHint* omnibox_hint);
 
  private:
   HintInfoBarDelegate(OmniboxSearchHint* omnibox_hint,
                       InfoBarService* infobar_service);
   virtual ~HintInfoBarDelegate();
 
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
-  virtual gfx::Image* GetIcon() const OVERRIDE;
+  virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const OVERRIDE;
 
   // The omnibox hint that shows us.
   OmniboxSearchHint* omnibox_hint_;
@@ skipping 72 matching lines @@
     UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Ignored", 1);
 }
 
 void HintInfoBarDelegate::InfoBarDismissed() {
   action_taken_ = true;
   UMA_HISTOGRAM_COUNTS("OmniboxSearchHint.Closed", 1);
   // User closed the infobar, let's not bug him again with this in the future.
   omnibox_hint_->DisableHint();
 }
 
-gfx::Image* HintInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-     IDR_INFOBAR_QUESTION_MARK);
+int HintInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_QUESTION_MARK;
 }
 
 InfoBarDelegate::Type HintInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 string16 HintInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_OMNIBOX_SEARCH_HINT_INFOBAR_TEXT);
 }
 
@@ skipping 85 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSearchInOmniboxHint);
 }