Adds selection expansion support for Contextual Search.

chrome/browser/android/contextualsearch/contextual_search_manager.cc

 // 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.
 
 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h"
 
 #include <set>
 
 #include "base/android/jni_string.h"
 #include "base/callback.h"
@@ skipping 91 matching lines @@
                                           base_content_view_core,
                                           may_send_base_page_url);
 }
 
 void ContextualSearchManager::OnSearchTermResolutionResponse(
     bool is_invalid,
     int response_code,
     const std::string& search_term,
     const std::string& display_text,
     const std::string& alternate_term,
-    bool prevent_preload) {
+    bool prevent_preload,
+    int selection_start_adjust,
+    int selection_end_adjust) {
   // Notify the Java UX of the result.
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> j_search_term =
       base::android::ConvertUTF8ToJavaString(env, search_term.c_str());
   base::android::ScopedJavaLocalRef<jstring> j_display_text =
       base::android::ConvertUTF8ToJavaString(env, display_text.c_str());
   base::android::ScopedJavaLocalRef<jstring> j_alternate_term =
       base::android::ConvertUTF8ToJavaString(env, alternate_term.c_str());
   Java_ContextualSearchManager_onSearchTermResolutionResponse(
-      env,
-      java_manager_.obj(),
-      is_invalid,
-      response_code,
-      j_search_term.obj(),
-      j_display_text.obj(),
-      j_alternate_term.obj(),
-      prevent_preload);
+      env, java_manager_.obj(), is_invalid, response_code, j_search_term.obj(),
+      j_display_text.obj(), j_alternate_term.obj(), prevent_preload,
+      selection_start_adjust, selection_end_adjust);
 }
 
 void ContextualSearchManager::OnSurroundingTextAvailable(
     const std::string& before_text,
     const std::string& after_text) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> j_before_text =
       base::android::ConvertUTF8ToJavaString(env, before_text.c_str());
   base::android::ScopedJavaLocalRef<jstring> j_after_text =
       base::android::ConvertUTF8ToJavaString(env, after_text.c_str());
@@ skipping 117 matching lines @@
 }
 
 bool RegisterContextualSearchManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, jobject obj) {
   ContextualSearchManager* manager = new ContextualSearchManager(env, obj);
   return reinterpret_cast<intptr_t>(manager);
 }