chrome/browser/ui/android/infobars/confirm_infobar.cc - Issue 1384153003: Introduce a way to define Android-only IDR values that doesn't require

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/android/infobars/confirm_infobar.cc

Issue 1384153003: Introduce a way to define Android-only IDR values that doesn't require (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: shortcircuit pointless lookup Created 5 years, 2 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

Index: chrome/browser/ui/android/infobars/confirm_infobar.cc

diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc

index 508de2b92df2c0fe3146ce08a1a69abde19763ed..8052f6fce1446cf75edef2933c0f3891d407723c 100644

--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc

+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc

@@ -58,7 +58,8 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(

env, delegate->GetLinkText());

ScopedJavaLocalRef<jobject> java_bitmap;

- if (!delegate->GetIcon().IsEmpty()) {

+ if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID &&

+ !delegate->GetIcon().IsEmpty()) {

java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());

}

« no previous file with comments | « chrome/browser/notifications/notification_permission_infobar_delegate.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »