Separate ContextualSearchPanel from OverlayPanel

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java
index f7539c0078f9d8a6afe9d3d9e91bf2a5f9908265..bf8a6ea82ad226168f27210802fc9fb42573ed25 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java
@@ -4,29 +4,27 @@
 
 package org.chromium.chrome.browser.contextualsearch;
 
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayContentDelegate;
-import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.StateChangeReason;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanelDelegate;
-import org.chromium.chrome.browser.customtabs.CustomTab;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.common.TopControlsState;
 
 /**
  * The delegate that provides global management functionality for Contextual Search.
  */
 public interface ContextualSearchManagementDelegate {
+
     /**
-     * @return Whether the Search Panel is showing.
+     * @return The ChromeActivity that associated with the manager.
      */
-    boolean isShowingSearchPanel();
+    ChromeActivity getChromeActivity();
 
     /**
-     * Sets the preference state to enabled or disabled.
-     *
-     * @param enabled Whether the preference should be set to enabled.
+     * @return Whether the Search Panel is showing.
      */
-    void setPreferenceState(boolean enabled);
+    boolean isShowingSearchPanel();
 
     /**
      * @return Whether the Opt-out promo is available to be be shown in the panel.
@@ -55,13 +53,6 @@ public interface ContextualSearchManagementDelegate {
     void promoteToTab();
 
     /**
-     * Gets the Search Content View's vertical scroll position. If the Search Content View
-     * is not available it returns -1.
-     * @return The Search Content View scroll position.
-     */
-    float getSearchContentViewVerticalScroll();
-
-    /**
      * Sets the delegate responsible for manipulating the ContextualSearchLayout.
      * @param delegate The ContextualSearchLayoutDelegate.
      */
@@ -97,22 +88,6 @@ public interface ContextualSearchManagementDelegate {
     void onCloseContextualSearch(StateChangeReason reason);
 
     /**
-     * Gets the {@code ContentViewCore} associated with Contextual Search Panel.
-     * @return Contextual Search Panel's {@code ContentViewCore}.
-     */
-    ContentViewCore getSearchContentViewCore();
-
-    /**
-     * @return The resource id that contains how large the top controls are.
-     */
-    int getControlContainerHeightResource();
-
-    /**
-     * @return Whether the current activity contains a {@link CustomTab}.
-     */
-    boolean isCustomTab();
-
-    /**
      * This is called on navigation of the contextual search pane This is called on navigation
      * of the contextual search panel.
      * @param isFailure If the request resulted in an error page.