chrome/browser/pepper_broker_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/pepper_broker_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/pepper_broker_infobar_delegate.cc

diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc

index 4f959ca14de24b18ab24625fc687228e420a892d..4a893a06ff06fd822f1ed27e8ae00b48e801a4ae 100644

--- a/chrome/browser/pepper_broker_infobar_delegate.cc

+++ b/chrome/browser/pepper_broker_infobar_delegate.cc

@@ -150,9 +150,8 @@ PepperBrokerInfoBarDelegate::~PepperBrokerInfoBarDelegate() {

callback_.Run(false);

}

-gfx::Image* PepperBrokerInfoBarDelegate::GetIcon() const {

- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(

- IDR_INFOBAR_PLUGIN_INSTALL);

+int PepperBrokerInfoBarDelegate::GetIconID() const {

+ return IDR_INFOBAR_PLUGIN_INSTALL;

}

string16 PepperBrokerInfoBarDelegate::GetMessageText() const {