[ContextualSearch] Adds long press promo for Contextual Search.

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;
@@ skipping 492 matching lines @@
             // Although the surroundings are extracted, they will not be sent to the server as
             // part of search term resolution, just sent to Icing which keeps them local until
             // the user activates a Voice Search.
             nativeGatherSurroundingText(mNativeContextualSearchManagerPtr,
                     mSelectionController.getSelectedText(), NEVER_USE_RESOLVED_SEARCH_TERM,
                     getBaseContentView(), mPolicy.maySendBasePageUrl());
         }
 
         mWereSearchResultsSeen = false;
 
+        // Show the Peek Promo only when the Panel wasn't previously visible, provided
+        // the policy allows it.
+        if (!mSearchPanelDelegate.isShowing()) {
+            boolean isPeekPromoAvailable = mPolicy.isPeekPromoAvailable(mSelectionController);
+            if (isPeekPromoAvailable) {
+                mSearchPanelDelegate.showPeekPromo();
+                mPolicy.registerPeekPromoSeen();
+            }
+        }
+
         // TODO(donnd): although we are showing the bar here, we have not yet set the text!
         // Refactor to show the bar and set the text at the same time!
         // TODO(donnd): If there was a previously ongoing contextual search, we should ensure
         // it's registered as closed.
         mSearchPanelDelegate.peekPanel(stateChangeReason);
 
         // Note: now that the contextual search has properly started, set the promo involvement.
         if (mPolicy.isPromoAvailable()) {
             mIsShowingPromo = true;
             mDidLogPromoOutcome = false;
@@ skipping 558 matching lines @@
                 ? entry.getUrl() : searchContentViewCore.getWebContents().getUrl();
         return url;
     }
 
     @Override
     public float getSearchContentViewVerticalScroll() {
         return mSearchPanelDelegate.getContentViewCore() != null
                 ? mSearchPanelDelegate.getContentViewCore().computeVerticalScrollOffset() : -1.f;
     }
 
-    /**
-     * This is called when the search panel is shown or is hidden.
-     * @param isVisible True if the panel is now visible.
-     */
-    public void onContentViewVisibilityChanged(boolean isVisible) {
-        if (isVisible) {
-            mWereSearchResultsSeen = true;
-            // If there's no current request, then either a search term resolution
-            // is in progress or we should do a verbatim search now.
-            if (mSearchRequest == null
-                    && mPolicy.shouldCreateVerbatimRequest(mSelectionController,
-                            mNetworkCommunicator.getBasePageUrl())) {
-                mSearchRequest = new ContextualSearchRequest(
-                        mSelectionController.getSelectedText());
-                mDidStartLoadingResolvedSearchRequest = false;
-            }
-            if ((mSearchRequest != null && !mDidStartLoadingResolvedSearchRequest)
-                    || mShouldLoadDelayedSearch) {
-                // mShouldLoadDelayedSearch is used in the long-press case to load content. Since
-                // content is now created and destroyed for each request, was impossible to know if
-                // content was already loaded or recently needed to be; this is for the case where
-                // it needed to be.
-                mSearchRequest.setNormalPriority();
-                loadSearchUrl();
-            }
-            mShouldLoadDelayedSearch = true;
-            mPolicy.updateCountersForOpen();
-        }
-    }
-
     @Override
     public void preserveBasePageSelectionOnNextLossOfFocus() {
         ContentViewCore basePageContentView = getBaseContentView();
         if (basePageContentView != null) {
             basePageContentView.preserveSelectionOnNextLossOfFocus();
         }
     }
 
     @Override
     public void dismissContextualSearchBar() {
@@ skipping 111 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);
 }