chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java - Issue 997733002: [Contextual Search] Prevents promo from being displayed incorrectly.

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/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

Issue 997733002: [Contextual Search] Prevents promo from being displayed incorrectly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing Donn's comment Created 5 years, 9 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/compositor/bottombar/contextualsearch/ContextualSearchPanel.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

index 91c3bd15963290015e1f15a1899d78ede66c7d96..e6deaa663411b57c2e7c4fc8c20733ac219fc227 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java

@@ -506,7 +506,6 @@ abstract class ContextualSearchPanelBase extends ContextualSearchPanelStateHandl

private float mPromoContentHeight;

private boolean mShouldHidePromoHeader;

- private static final float DEFAULT_PROMO_HEIGHT_DP = 250.f;

/**

* Sets the height of the promo content.

@@ -517,11 +516,10 @@ abstract class ContextualSearchPanelBase extends ContextualSearchPanelStateHandl

}

/**

- * Gets the height of the promo content.

+ * Gets the height of the promo content, or -1 if height has not been calculated.

public float getPromoContentHeight() {

- return mPromoContentHeight > 0.0f

- ? mPromoContentHeight : DEFAULT_PROMO_HEIGHT_DP;

+ return mPromoContentHeight > 0.0f ? mPromoContentHeight : -1.f;

}

/**