chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java - Issue 1596713003: Discourage creation of Java infobars without InfoBarDelegates

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/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

Issue 1596713003: Discourage creation of Java infobars without InfoBarDelegates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing Created 4 years, 11 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/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarListeners.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

index de30144d1a5da791638f293a16bfeb7ba9a8f23a..c84ed0c5622ce25e4d7f6d73215e4e265cf18072 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java

@@ -210,7 +210,7 @@ public final class InfoBarLayout extends ViewGroup implements View.OnClickListen

public void setButtons(String primaryText, String secondaryText) {

if (TextUtils.isEmpty(primaryText)) {

- assert secondaryText == null;

+ assert TextUtils.isEmpty(secondaryText);

return;

}

@@ -484,7 +484,7 @@ public final class InfoBarLayout extends ViewGroup implements View.OnClickListen

if (mMessageMainText != null) fullString.append(mMessageMainText);

// Concatenate the text to display for the link and make it clickable.

- if (mMessageLinkText != null) {

+ if (!TextUtils.isEmpty(mMessageLinkText)) {

if (fullString.length() > 0) fullString.append(" ");

int spanStart = fullString.length();