[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/geolocation/geolocation_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/geolocation/geolocation_infobar_delegate.h"
 
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
 typedef GeolocationInfoBarDelegateAndroid DelegateType;
 #else
 typedef GeolocationInfoBarDelegate DelegateType;
 #endif
 
 
 // static
@@ skipping 29 matching lines @@
   return true;
 }
 
 void GeolocationInfoBarDelegate::SetPermission(bool update_content_setting,
                                                bool allowed) {
   controller_->OnPermissionSet(id_, requesting_frame_,
                                web_contents()->GetURL(),
                                update_content_setting, allowed);
 }
 
-gfx::Image* GeolocationInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_GEOLOCATION_INFOBAR_ICON);
+int GeolocationInfoBarDelegate::GetIconID() const {
+  return IDR_GEOLOCATION_INFOBAR_ICON;
 }
 
 InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 bool GeolocationInfoBarDelegate::ShouldExpireInternal(
     const content::LoadCommittedDetails& details) const {
   // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but
   // uses the unique ID we set in the constructor instead of that stored in the
@@ skipping 34 matching lines @@
 #endif
 
   content::OpenURLParams params(
       google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
       content::Referrer(),
       (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
       content::PAGE_TRANSITION_LINK, false);
   web_contents()->OpenURL(params);
   return false;  // Do not dismiss the info bar.
 }