Adds selection expansion support 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.os.Handler;
 import android.view.View;
 import android.view.ViewGroup;
@@ skipping 635 matching lines @@
     /**
      * Called in response to the
      * {@link ContextualSearchManager#nativeStartSearchTermResolutionRequest} method.
      * @param isNetworkUnavailable Indicates if the network is unavailable, in which case all other
      *        parameters should be ignored.
      * @param responseCode The HTTP response code.  If the code is not OK, the query
      *        should be ignored.
      * @param searchTerm The term to use in our subsequent search.
      * @param displayText The text to display in our UX.
      * @param alternateTerm The alternate term to display on the results page.
+     * @param selectionStartAdjust The start offset adjustment of the selection to use to highlight
+     *        the search term.
+     * @param selectionEndAdjust The end offset adjustment of the selection to use to highlight
+     *        the search term.
      */
     @CalledByNative
     public void onSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,
             final String searchTerm, final String displayText, final String alternateTerm,
-            boolean doPreventPreload) {
+            boolean doPreventPreload, int selectionStartAdjust, int selectionEndAdjust) {
         mNetworkCommunicator.handleSearchTermResolutionResponse(isNetworkUnavailable, responseCode,
-                searchTerm, displayText, alternateTerm, doPreventPreload);
+                searchTerm, displayText, alternateTerm, doPreventPreload, selectionStartAdjust,
+                selectionEndAdjust);
     }
 
     @Override
     public void handleSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,
-            String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload) {
+            String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload,
+            int selectionStartAdjust, int selectionEndAdjust) {
         if (!mSearchPanelDelegate.isShowing()) return;
 
         // Show an appropriate message for what to search for.
         String message;
         boolean doLiteralSearch = false;
         if (isNetworkUnavailable) {
             message = mActivity.getResources().getString(
                     R.string.contextual_search_network_unavailable);
         } else if (!isHttpFailureCode(responseCode)) {
             message = displayText;
@@ skipping 22 matching lines @@
             mDidLoadResolvedSearchRequest = false;
             if (mIsSearchContentViewShowing) {
                 mSearchRequest.setNormalPriority();
             }
             if (mIsSearchContentViewShowing || shouldPreload) {
                 loadSearchUrl();
             }
             mPolicy.logSearchTermResolutionDetails(searchTerm,
                     mNetworkCommunicator.getBasePageUrl());
         }
+
+        if (selectionStartAdjust != 0 || selectionEndAdjust != 0) {
+            mSelectionController.adjustSelection(selectionStartAdjust, selectionEndAdjust);

[pedro (no code reviews), 2015/06/25 01:30:28]

Nit: Call it expandSelection() instead?

[aurimas (slooooooooow), 2015/07/01 00:45:38]

Done

+        }
     }
 
     /**
      * Loads a Search Request in the Contextual Search's Content View.
      */
     private void loadSearchUrl() {
         mLoadedSearchUrlTimeMs = System.currentTimeMillis();
         mNetworkCommunicator.loadUrl(mSearchRequest.getSearchUrl());
         mDidLoadResolvedSearchRequest = true;
 
@@ skipping 519 matching lines @@
             long nativeContextualSearchManager, String searchUrl, long searchUrlTimeMs);
     private native void nativeSetWebContents(long nativeContextualSearchManager,
             ContentViewCore searchContentViewCore, WebContentsDelegateAndroid delegate);
     private native void nativeDestroyWebContents(long nativeContextualSearchManager);
     private native void nativeReleaseWebContents(long nativeContextualSearchManager);
     private native void nativeDestroyWebContentsFromContentViewCore(
             long nativeContextualSearchManager, ContentViewCore contentViewCore);
     private native void nativeSetInterceptNavigationDelegate(long nativeContextualSearchManager,
             InterceptNavigationDelegate delegate, WebContents webContents);
 }