Separate ContextualSearchPanel from OverlayPanel

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.contextualsearch;
 
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnGlobalFocusChangeListener;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.SysUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayContentDelegate;
-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.bottombar.OverlayPanel.PanelState;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanelDelegate;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchSelectionController.SelectionType;
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
@@ skipping 51 matching lines @@
     private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
     private TabModelObserver mTabModelObserver;
     private FindToolbarManager mFindToolbarManager;
     private FindToolbarObserver mFindToolbarObserver;
     private boolean mIsSearchContentViewShowing;
     private boolean mDidStartLoadingResolvedSearchRequest;
     private long mLoadedSearchUrlTimeMs;
     // TODO(donnd): consider changing this member's name to indicate "opened" instead of "seen".
     private boolean mWereSearchResultsSeen;
     private boolean mWereInfoBarsHidden;
-    private boolean mDidLoadAnyUrl;
     private boolean mDidPromoteSearchNavigation;
     private boolean mDidBasePageLoadJustStart;
     private boolean mWasActivatedByTap;
     private boolean mIsInitialized;
 
     /**
      * This boolean is used for loading content after a long-press when content is not immediately
      * loaded.
      */
     private boolean mShouldLoadDelayedSearch;
@@ skipping 153 matching lines @@
         if (mFindToolbarManager != null) {
             mFindToolbarManager.removeObserver(mFindToolbarObserver);
             mFindToolbarManager = null;
             mFindToolbarObserver = null;
         }
     }
 
     @Override
     public void setContextualSearchPanelDelegate(ContextualSearchPanelDelegate delegate) {
         mSearchPanelDelegate = delegate;
-
-        mSearchPanelDelegate.setChromeActivity(mActivity);
     }
 
     @Override
-    public boolean isCustomTab() {
-        return mActivity.isCustomTab();
+    public ChromeActivity getChromeActivity() {
+        return mActivity;
     }
 
     /**
      * @return The {@link ContextualSearchPanelDelegate}, for testing purposes only.
      */
     @VisibleForTesting
     public ContextualSearchPanelDelegate getContextualSearchPanelDelegate() {
         return mSearchPanelDelegate;
     }
 
@@ skipping 24 matching lines @@
     @Nullable private ContentViewCore getBaseContentView() {
         return mSelectionController.getBaseContentView();
     }
 
     @Override
     public boolean isShowingSearchPanel() {
         return mSearchPanelDelegate.isShowing();
     }
 
     @Override
-    public void setPreferenceState(boolean enabled) {
-        PrefServiceBridge.getInstance().setContextualSearchState(enabled);
-    }
-
-    @Override
     public boolean isPromoAvailable() {
         return mPolicy.isPromoAvailable();
     }
 
-    @Override
-    public int getControlContainerHeightResource() {
-        return mActivity.getControlContainerHeightResource();
-    }
-
     /**
      * Hides the Contextual Search UX.
      * @param reason The {@link StateChangeReason} for hiding Contextual Search.
      */
     public void hideContextualSearch(StateChangeReason reason) {
         if (mSearchPanelDelegate == null) return;
 
         if (mSearchPanelDelegate.isShowing()) {
             mSearchPanelDelegate.closePanel(reason, false);
         }
@@ skipping 552 matching lines @@
             }
             return true;
         }
     }
 
     // --------------------------------------------------------------------------------------------
     // Search Content View
     // --------------------------------------------------------------------------------------------
 
     /**
-     * Gets the {@code ContentViewCore} associated with Contextual Search Panel.
-     * @return Contextual Search Panel's {@code ContentViewCore}.
-     */
-    @Override
-    public ContentViewCore getSearchContentViewCore() {
-        return mSearchPanelDelegate.getContentViewCore();
-    }
-
-    /**
      * Sets the {@code ContextualSearchContentViewDelegate} associated with the Content View.
      * @param delegate
      */
     public void setSearchContentViewDelegate(ContextualSearchContentViewDelegate delegate) {
         mSearchContentViewDelegate = delegate;
     }
 
     /**
      * Removes the last resolved search URL from the Chrome history.
      */
@@ skipping 64 matching lines @@
         return mSearchPanelDelegate.didTouchSearchContentView()
                 && !mSearchPanelDelegate.isProcessingPendingNavigation();
     }
 
     /**
      * Called to check if an external navigation is being done and take the appropriate action:
      * Auto-promotes the panel into a separate tab if that's not already being done.
      * @param url The URL we are navigating to.
      */
     public void onExternalNavigation(String url) {
-        mSearchPanelDelegate.updateTopControlState();
+        mSearchPanelDelegate.updateTopControlsState();
 
         if (!mDidPromoteSearchNavigation
                 && !BLACKLISTED_URL.equals(url)
                 && !url.startsWith(INTENT_URL_PREFIX)
                 && shouldPromoteSearchNavigation()) {
             // Do not promote to a regular tab if we're loading our Resolved Search
             // URL, otherwise we'll promote it when prefetching the Serp.
             // Don't promote URLs when they are navigating to an intent - this is
             // handled by the InterceptNavigationDelegate which uses a faster
             // maximizing animation.
@@ skipping 65 matching lines @@
         // First, check the pending navigation entry, because there might be an navigation
         // not yet committed being processed. Otherwise, get the URL from the WebContents.
         NavigationEntry entry =
                 searchContentViewCore.getWebContents().getNavigationController().getPendingEntry();
         String url = entry != null
                 ? entry.getUrl() : searchContentViewCore.getWebContents().getUrl();
         return url;
     }
 
     @Override
-    public float getSearchContentViewVerticalScroll() {
-        return mSearchPanelDelegate.getContentViewCore() != null
-                ? mSearchPanelDelegate.getContentViewCore().computeVerticalScrollOffset() : -1.f;
-    }
-
-    @Override
     public void preserveBasePageSelectionOnNextLossOfFocus() {
         ContentViewCore basePageContentView = getBaseContentView();
         if (basePageContentView != null) {
             basePageContentView.preserveSelectionOnNextLossOfFocus();
         }
     }
 
     @Override
     public void dismissContextualSearchBar() {
         hideContextualSearch(StateChangeReason.UNKNOWN);
@@ skipping 110 matching lines @@
 
     private native long nativeInit();
     private native void nativeDestroy(long nativeContextualSearchManager);
     private native void nativeStartSearchTermResolutionRequest(long nativeContextualSearchManager,
             String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
             boolean maySendBasePageUrl);
     private native void nativeGatherSurroundingText(long nativeContextualSearchManager,
             String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
             boolean maySendBasePageUrl);
 }