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

Unified Diff: chrome/browser/ui/cocoa/keystone_infobar_delegate.mm

Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixes redux 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/ui/cocoa/keystone_infobar_delegate.mm
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
index 7543e9017d726dcce3881a3411e433785910678b..2704a456e787a9a4fe3a5baebf06c971d8a4716f 100644
--- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
+++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -29,7 +29,6 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
class SkBitmap;
@@ -53,7 +52,7 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
void SetCanExpire() { can_expire_ = true; }
// ConfirmInfoBarDelegate
- virtual gfx::Image* GetIcon() const OVERRIDE;
+ virtual int GetIconID() const OVERRIDE;
virtual string16 GetMessageText() const OVERRIDE;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
@@ -110,9 +109,8 @@ KeystonePromotionInfoBarDelegate::KeystonePromotionInfoBarDelegate(
KeystonePromotionInfoBarDelegate::~KeystonePromotionInfoBarDelegate() {
}
-gfx::Image* KeystonePromotionInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_PRODUCT_LOGO_32);
+int KeystonePromotionInfoBarDelegate::GetIconID() const {
+ return IDR_PRODUCT_LOGO_32;
}
string16 KeystonePromotionInfoBarDelegate::GetMessageText() const {

Powered by Google App Engine
This is Rietveld 408576698