chrome/browser/ui/views/infobars/infobar_view.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/views/infobars/infobar_view.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:

Index: chrome/browser/ui/views/infobars/infobar_view.cc

diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc

index ab3686243c947fcd4cf0aa5bce4147340d223592..7995e18b8d94e1f3d91ba397e2a4e580c1466519 100644

--- a/chrome/browser/ui/views/infobars/infobar_view.cc

+++ b/chrome/browser/ui/views/infobars/infobar_view.cc

@@ -216,10 +216,10 @@ void InfoBarView::ViewHierarchyChanged(

View::ViewHierarchyChanged(details);

if (details.is_add && (details.child == this) && (close_button_ == NULL)) {

- gfx::Image* image = delegate()->GetIcon();

- if (image) {

+ gfx::Image image = delegate()->GetIcon();

+ if (!image.IsEmpty()) {

icon_ = new views::ImageView;

- icon_->SetImage(image->ToImageSkia());

+ icon_->SetImage(image.ToImageSkia());

AddChildView(icon_);

}