[Contextual Search] Trigger the translation one-box.

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"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
+#include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/ContextualSearchManager_jni.h"
 #include "net/url_request/url_fetcher_impl.h"
 
@@ skipping 58 matching lines @@
   DCHECK(base_content_view_core);
   std::string selection(
       base::android::ConvertJavaStringToUTF8(env, j_selection));
   bool use_resolved_search_term = j_use_resolved_search_term;
   bool may_send_base_page_url = j_may_send_base_page_url;
   delegate_->GatherAndSaveSurroundingText(selection, use_resolved_search_term,
                                           base_content_view_core,
                                           may_send_base_page_url);
 }
 
+base::android::ScopedJavaLocalRef<jstring>
+ContextualSearchManager::GetTargetLanguage(JNIEnv* env, jobject obj) {
+  std::string target_language = delegate_->GetTargetLanguage();
+  base::android::ScopedJavaLocalRef<jstring> j_target_language =
+      base::android::ConvertUTF8ToJavaString(env, target_language.c_str());
+  return j_target_language;
+}
+
 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,
-    int selection_start_adjust,
-    int selection_end_adjust) {
+    const ResolvedSearchTerm& resolved_search_term) {

[pedro (no code reviews), 2015/09/23 18:33:55]

I don't see the point why we are storing this in a struct if we will end up
having to split it up right after that, because we need to pass individual
values to the java method. Is there a reason why we are storing it in a struct?

[Donn Denman, 2015/10/09 22:08:23]

I think it makes this code and the tests more readable.  I agree that the win is
small, but it still moves some of the complication out of the bigger files that
are already complicated.

   // 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::ConvertUTF8ToJavaString(
+          env, resolved_search_term.search_term.c_str());
   base::android::ScopedJavaLocalRef<jstring> j_display_text =
-      base::android::ConvertUTF8ToJavaString(env, display_text.c_str());
+      base::android::ConvertUTF8ToJavaString(
+          env, resolved_search_term.display_text.c_str());
   base::android::ScopedJavaLocalRef<jstring> j_alternate_term =
-      base::android::ConvertUTF8ToJavaString(env, alternate_term.c_str());
+      base::android::ConvertUTF8ToJavaString(
+          env, resolved_search_term.alternate_term.c_str());
+  base::android::ScopedJavaLocalRef<jstring> j_language =
+      base::android::ConvertUTF8ToJavaString(
+          env, resolved_search_term.language.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,
-      selection_start_adjust, selection_end_adjust);
+      env, java_manager_.obj(), resolved_search_term.is_invalid,
+      resolved_search_term.response_code, j_search_term.obj(),
+      j_display_text.obj(), j_alternate_term.obj(),
+      resolved_search_term.prevent_preload,
+      resolved_search_term.selection_start_adjust,
+      resolved_search_term.selection_end_adjust, j_language.obj());
 }
 
 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 20 matching lines @@
 }
 
 bool RegisterContextualSearchManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ContextualSearchManager* manager = new ContextualSearchManager(env, obj);
   return reinterpret_cast<intptr_t>(manager);
 }