Overlay content is its own class

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 dd4be6bedf90f62a61070dfb6b015f4cf92d1ed1..f7539c0078f9d8a6afe9d3d9e91bf2a5f9908265 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,12 +4,11 @@
 
 package org.chromium.chrome.browser.contextualsearch;
 
+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.contextualsearch.ContextualSearchPanelDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTab;
-import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.components.navigation_interception.NavigationParams;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.common.TopControlsState;
 
@@ -114,17 +113,6 @@ public interface ContextualSearchManagementDelegate {
     boolean isCustomTab();
 
     /**
-     * This method is called when the panel's ContentViewCore is created.
-     * @param contentView The created ContentViewCore.
-     */
-    void onContentViewCreated(ContentViewCore contentView);
-
-    /**
-     * This method is called when the panel's ContentViewCore is destroyed.
-     */
-    void onContentViewDestroyed();
-
-    /**
      * 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.
@@ -132,40 +120,7 @@ public interface ContextualSearchManagementDelegate {
     void onContextualSearchRequestNavigation(boolean isFailure);
 
     /**
-     * This is called when the search panel is shown or is hidden.
-     * @param isVisible True if the panel is now visible.
-     */
-    void onContentViewVisibilityChanged(boolean isVisible);
-
-    /**
-     * This is called when the panel has loaded search results.
-     */
-    void onSearchResultsLoaded();
-
-    /**
-     * Called when an external navigation occurs.
-     * @param url The URL being navigated to.
-     */
-    void onExternalNavigation(String url);
-
-    /**
-     * Handles the WebContentsObserver#didNavigateMainFrame callback.
-     * @param url The URL of the navigation.
-     * @param httpResultCode The HTTP result code of the navigation.
-     */
-    void handleDidNavigateMainFrame(String url, int httpResultCode);
-
-    /**
-     * Called when the WebContents for the panel starts loading.
-     */
-    void onStartedLoading();
-
-    /**
-     * Determine if a particular navigation should be intercepted.
-     * @param externalNavHandler External navigation handler for the activity the panel is in.
-     * @param navigationParams The navigation params for the current navigation.
-     * @return True if the navigation should be intercepted.
+     * @return An OverlayContentDelegate to watch events on the panel's content.
      */
-    boolean shouldInterceptNavigation(ExternalNavigationHandler externalNavHandler,
-            NavigationParams navigationParams);
+    OverlayContentDelegate getOverlayContentDelegate();
 }