[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/ui/auto_login_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/ui/auto_login_infobar_delegate.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 20 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 
 using content::NavigationController;
 using content::NotificationSource;
 using content::NotificationDetails;
 
 
 // AutoLoginRedirector --------------------------------------------------------
 
 namespace {
 
@@ skipping 120 matching lines @@
 AutoLoginInfoBarDelegate::~AutoLoginInfoBarDelegate() {
   if (!button_pressed_)
     RecordHistogramAction(HISTOGRAM_IGNORED);
 }
 
 void AutoLoginInfoBarDelegate::InfoBarDismissed() {
   RecordHistogramAction(HISTOGRAM_DISMISSED);
   button_pressed_ = true;
 }
 
-gfx::Image* AutoLoginInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_AUTOLOGIN);
+int AutoLoginInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_AUTOLOGIN;
 }
 
 InfoBarDelegate::Type AutoLoginInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 AutoLoginInfoBarDelegate*
     AutoLoginInfoBarDelegate::AsAutoLoginInfoBarDelegate() {
   return this;
 }
@@ skipping 33 matching lines @@
   DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, type);
   // owner() can be NULL when InfoBarService removes us. See
   // |InfoBarDelegate::clear_owner|.
   if (owner())
     owner()->RemoveInfoBar(this);
 }
 
 void AutoLoginInfoBarDelegate::RecordHistogramAction(Actions action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Regular", action, HISTOGRAM_MAX);
 }