chrome/browser/ui/cocoa/infobars/infobar_controller.mm - 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/cocoa/infobars/infobar_controller.mm

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/cocoa/infobars/infobar_controller.mm

diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

index 081fb11c115f8011db9e6e3e6f9b0c98c8814c86..24f2dd3fc51a5d70c17bf5aeba2e28aee66b48b0 100644

--- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

+++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm

@@ -70,8 +70,8 @@ const float kAnimateCloseDuration = 0.12;

[[closeButton_ cell] setImageID:IDR_CLOSE_1

forButtonState:image_button_cell::kDisabledState];

- if (delegate_->GetIcon()) {

- [image_ setImage:delegate_->GetIcon()->ToNSImage()];

+ if (!delegate_->GetIcon().IsEmpty()) {

+ [image_ setImage:delegate_->GetIcon().ToNSImage()];

} else {

// No icon, remove it from the view and grow the textfield to include the

// space.