chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelDelegate.java - Issue 1403813003: [Contextual Search] Fixes ContentView regressions.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelDelegate.java

Issue 1403813003: [Contextual Search] Fixes ContentView regressions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add TODO as per offline chat with mdjones@ 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

« chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelBase.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/OverlayPanelContentFactory.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 56ee380c5d53545cc7b7ae69020886fc333077e0..5aef62286300a7005f6883de4d208ea3a243c82c 100644

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

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

@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.browser.ChromeActivity;

-import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelContent;

import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.PanelState;

import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;

import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation;

@@ -192,10 +191,9 @@ public interface ContextualSearchPanelDelegate {

void setWasSearchContentViewSeen();

/**

- * Sets the visibility of the Search Content View.

- * @param isVisible True to make it visible.

+ * Acknowledges the intent to load an URL soon.

- void setSearchContentViewVisibility(boolean isVisible);

+ void acknowledgeIntentToLoad();

/**

* Creates an {@link org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animatable}

@@ -203,9 +201,11 @@ public interface ContextualSearchPanelDelegate {

<T extends Enum<?>> void addToAnimation(ChromeAnimation.Animatable<T> object, T prop,

float start, float end, long duration, long startTime);

/**

- * @param panelContent The OverlayPanelContent that this panel should use.

+ * Allows test cases to use a custom OverlayPanelContent in tests.

+ * @param factory The OverlayPanelContentFactory that will create the OverlayPanelContent.

@VisibleForTesting

- void setOverlayPanelContent(OverlayPanelContent panelContent);

+ void setOverlayPanelContentFactory(OverlayPanelContentFactory factory);

}