Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1145)

Unified Diff: chrome/browser/notifications/desktop_notification_service.cc

Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused includes Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/desktop_notification_service.cc
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index e2127ea9366e591bcd26c70b7c8fa5350ede839a..f3cfe8ea499e0f01a1190f8ffbfb96278e052bb9 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -126,7 +126,7 @@ class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
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;
@@ -198,9 +198,8 @@ NotificationPermissionInfoBarDelegate::
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

Powered by Google App Engine
This is Rietveld 408576698