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

Unified Diff: chrome/browser/ui/startup/autolaunch_prompt_win.cc

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/startup/autolaunch_prompt_win.cc
diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
index 5028fa0482873e3eb99c5e24bac5ea21927b12fc..d9696422721aa460313621b7c885c77426fb6950 100644
--- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc
+++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
@@ -27,7 +27,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"
using content::BrowserThread;
@@ -53,7 +52,7 @@ class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
void AllowExpiry() { should_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;
@@ -108,9 +107,8 @@ AutolaunchInfoBarDelegate::AutolaunchInfoBarDelegate(
AutolaunchInfoBarDelegate::~AutolaunchInfoBarDelegate() {
}
-gfx::Image* AutolaunchInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_PRODUCT_LOGO_32);
+int AutolaunchInfoBarDelegate::GetIconID() const {
+ return IDR_PRODUCT_LOGO_32;
}
string16 AutolaunchInfoBarDelegate::GetMessageText() const {
« no previous file with comments | « chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc ('k') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698