chrome/browser/geolocation/geolocation_infobar_delegate.cc - Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Renaming back to GetIcon() 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:

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..dc683555d9f17bdfd8ed6bcb081e9a64f0581dd4 100644

--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc

+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc

@@ -65,9 +65,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 {