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

Unified Diff: chrome/browser/geolocation/geolocation_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/geolocation/geolocation_infobar_delegate.cc
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
index 2b64fdfb280079b225f2977b7079a8f0366cfc2c..07caf8aef652ee2ebe1308e5511e8e4f3b1d5478 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
@@ -15,7 +15,6 @@
#include "grit/theme_resources.h"
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
#if defined(OS_ANDROID)
#include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
@@ -65,9 +64,8 @@ void GeolocationInfoBarDelegate::SetPermission(bool update_content_setting,
update_content_setting, allowed);
}
-gfx::Image* GeolocationInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_GEOLOCATION_INFOBAR_ICON);
+int GeolocationInfoBarDelegate::GetIconID() const {
+ return IDR_GEOLOCATION_INFOBAR_ICON;
}
InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType() const {
« no previous file with comments | « chrome/browser/geolocation/geolocation_infobar_delegate.h ('k') | chrome/browser/infobars/infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698