[InfoBar] Add InfoBarDelegate::GetIconID()

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 108 matching lines @@
       InfoBarService* infobar_service,
       DesktopNotificationService* notification_service,
       const GURL& origin,
       const string16& display_name,
       int process_id,
       int route_id,
       int callback_context);
   virtual ~NotificationPermissionInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual gfx::Image* GetIcon() const OVERRIDE;
+  virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   // The origin we are asking for permissions on.
   GURL origin_;
 
   // The display name for the origin to be displayed.  Will be different from
@@ skipping 51 matching lines @@
 NotificationPermissionInfoBarDelegate::
     ~NotificationPermissionInfoBarDelegate() {
   if (!action_taken_)
     UMA_HISTOGRAM_COUNTS("NotificationPermissionRequest.Ignored", 1);
 
   RenderViewHost* host = RenderViewHost::FromID(process_id_, route_id_);
   if (host)
     host->DesktopNotificationPermissionRequestDone(callback_context_);
 }
 
-gfx::Image* NotificationPermissionInfoBarDelegate::GetIcon() const {
-  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_INFOBAR_DESKTOP_NOTIFICATIONS);
+int NotificationPermissionInfoBarDelegate::GetIconID() const {
+  return IDR_INFOBAR_DESKTOP_NOTIFICATIONS;
 }
 
 InfoBarDelegate::Type
     NotificationPermissionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 string16 NotificationPermissionInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_NOTIFICATION_PERMISSIONS,
                                     display_name_);
@@ skipping 417 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }