chrome/browser/ui/content_settings/content_setting_changed_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/ui/content_settings/content_setting_changed_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

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.h ('k') | chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.cc b/chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.cc

index 0bb12906388ca1870347c854674c8ae49752437a..d9a102db2bbb00bdb5e1ac5162096b9617c141b7 100644

--- a/chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.cc

+++ b/chrome/browser/ui/content_settings/content_setting_changed_infobar_delegate.cc

@@ -10,7 +10,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

void ContentSettingChangedInfoBarDelegate::Create(

@@ -35,8 +34,8 @@ ContentSettingChangedInfoBarDelegate::ContentSettingChangedInfoBarDelegate(

ContentSettingChangedInfoBarDelegate::~ContentSettingChangedInfoBarDelegate() {

}

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

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

+int ContentSettingChangedInfoBarDelegate::GetIconID() const {

+ return icon_;

}

InfoBarDelegate::Type ContentSettingChangedInfoBarDelegate::GetInfoBarType()