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

Unified Diff: chrome/browser/extensions/theme_installed_infobar_delegate.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/extensions/theme_installed_infobar_delegate.cc
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 4fb5f53228f6b394956f046ff5068b6553a1c288..d46bd3162184d198d5715b1f25725b362641b44e 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -20,7 +20,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"
// static
@@ -105,11 +104,10 @@ ThemeInstalledInfoBarDelegate::~ThemeInstalledInfoBarDelegate() {
theme_service_->OnInfobarDestroyed();
}
-gfx::Image* ThemeInstalledInfoBarDelegate::GetIcon() const {
+int ThemeInstalledInfoBarDelegate::GetIconID() const {
// TODO(aa): Reply with the theme's icon, but this requires reading it
// asynchronously from disk.
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_INFOBAR_THEME);
+ return IDR_INFOBAR_THEME;
}
InfoBarDelegate::Type ThemeInstalledInfoBarDelegate::GetInfoBarType() const {
« no previous file with comments | « chrome/browser/extensions/theme_installed_infobar_delegate.h ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698