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

Unified Diff: chrome/browser/ui/startup/default_browser_prompt.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
« no previous file with comments | « chrome/browser/ui/startup/bad_flags_prompt.cc ('k') | chrome/browser/ui/startup/session_crashed_prompt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/startup/default_browser_prompt.cc
diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc
index 5ad07b0890c2fefc7665634e35d953fce5795f58..e0a658a5204badfb6f4b4e3c2d3c544a8be4af6a 100644
--- a/chrome/browser/ui/startup/default_browser_prompt.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt.cc
@@ -30,7 +30,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;
@@ -74,7 +73,7 @@ class DefaultBrowserInfoBarDelegate : 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 NeedElevation(InfoBarButton button) const OVERRIDE;
@@ -135,9 +134,8 @@ DefaultBrowserInfoBarDelegate::~DefaultBrowserInfoBarDelegate() {
UMA_HISTOGRAM_COUNTS("DefaultBrowserWarning.Ignored", 1);
}
-gfx::Image* DefaultBrowserInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_PRODUCT_LOGO_32);
+int DefaultBrowserInfoBarDelegate::GetIconID() const {
+ return IDR_PRODUCT_LOGO_32;
}
string16 DefaultBrowserInfoBarDelegate::GetMessageText() const {
« no previous file with comments | « chrome/browser/ui/startup/bad_flags_prompt.cc ('k') | chrome/browser/ui/startup/session_crashed_prompt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698