[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ssl/ssl_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/ssl/ssl_tab_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 
 
 // SSLCertResultInfoBarDelegate -----------------------------------------------
 
 namespace {
 
 class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates an SSL cert result delegate.  If |previous_infobar| is
   // NULL, adds the infobar to |infobar_service|; otherwise, replaces
   // |previous_infobar|.  Returns the new delegate if it was successfully added.
   // |cert| is valid iff cert addition was successful.
   static InfoBarDelegate* Create(InfoBarService* infobar_service,
                                  InfoBarDelegate* previous_infobar,
                                  const string16& message,
                                  net::X509Certificate* cert);
 
  private:
   SSLCertResultInfoBarDelegate(InfoBarService* infobar_service,
                                const string16& message,
                                net::X509Certificate* cert);
   virtual ~SSLCertResultInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  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;
 
   string16 message_;
   scoped_refptr<net::X509Certificate> cert_;  // The cert we added, if any.
 
   DISALLOW_COPY_AND_ASSIGN(SSLCertResultInfoBarDelegate);
@@ skipping 17 matching lines @@
     const string16& message,
     net::X509Certificate* cert)
     : ConfirmInfoBarDelegate(infobar_service),
       message_(message),
       cert_(cert) {
 }
 
 SSLCertResultInfoBarDelegate::~SSLCertResultInfoBarDelegate() {
 }
 
-gfx::Image* SSLCertResultInfoBarDelegate::GetIcon() const {
+int SSLCertResultInfoBarDelegate::GetIconID() const {
   // TODO(davidben): use a more appropriate icon.
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_SAVE_PASSWORD);
+  return IDR_INFOBAR_SAVE_PASSWORD;
 }
 
 InfoBarDelegate::Type SSLCertResultInfoBarDelegate::GetInfoBarType() const {
   return cert_.get() ? PAGE_ACTION_TYPE : WARNING_TYPE;
 }
 
 string16 SSLCertResultInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
@@ skipping 153 matching lines @@
 SSLTabHelper::SSLAddCertData*
 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) {
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get())
     ptr_ref.reset(new SSLAddCertData(web_contents_));
   return ptr_ref.get();
 }