[Contextual Search] Trigger the translation one-box.

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

Index: chrome/browser/android/contextualsearch/contextual_search_delegate.cc
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
index 84f7b2b7cb7d415051322c528c84afdde9190789..8cebdeac630dbc5268121cb3c2684536c1af2cf2 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
@@ -12,11 +12,13 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "chrome/browser/android/proto/client_discourse_context.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/translate/translate_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/variations/net/variations_http_header_provider.h"
 #include "components/variations/variations_associated_data.h"
@@ -39,6 +41,7 @@ const char kContextualSearchDoNotSendURLParamName[] = "do_not_send_url";
 const char kContextualSearchResponseDisplayTextParam[] = "display_text";
 const char kContextualSearchResponseSelectedTextParam[] = "selected_text";
 const char kContextualSearchResponseSearchTermParam[] = "search_term";
+const char kContextualSearchResponseLanguageParam[] = "lang";
 const char kContextualSearchResponseResolvedTermParam[] = "resolved_term";
 const char kContextualSearchPreventPreload[] = "prevent_preload";
 const char kContextualSearchMentions[] = "mentions";
@@ -148,15 +151,17 @@ void ContextualSearchDelegate::OnURLFetchComplete(
   int mention_end = 0;
   int start_adjust = 0;
   int end_adjust = 0;
+  std::string language;
+  std::string target_language;
 
   if (source->GetStatus().is_success() && response_code == 200) {
     std::string response;
     bool has_string_response = source->GetResponseAsString(&response);
     DCHECK(has_string_response);
     if (has_string_response) {
-      DecodeSearchTermsFromJsonResponse(response, &search_term, &display_text,
-                                        &alternate_term, &prevent_preload,
-                                        &mention_start, &mention_end);
+      DecodeSearchTermFromJsonResponse(response, &search_term, &display_text,
+                                       &alternate_term, &prevent_preload,
+                                       &mention_start, &mention_end, &language);
       if (mention_start != 0 || mention_end != 0) {
         // Sanity check that our selection is non-zero and it is less than
         // 100 characters as that would make contextual search bar hide.
@@ -176,9 +181,11 @@ void ContextualSearchDelegate::OnURLFetchComplete(
     }
   }
   bool is_invalid = response_code == net::URLFetcher::RESPONSE_CODE_INVALID;
-  search_term_callback_.Run(
+  ResolvedSearchTerm resolved_search_term(
       is_invalid, response_code, search_term, display_text, alternate_term,
-      prevent_preload == kDoPreventPreloadValue, start_adjust, end_adjust);
+      prevent_preload == kDoPreventPreloadValue, start_adjust, end_adjust,
+      language);
+  search_term_callback_.Run(resolved_search_term);
 
   // The ContextualSearchContext is consumed once the request has completed.
   context_.reset();
@@ -424,16 +431,29 @@ bool ContextualSearchDelegate::CanSendPageURL(
   return true;
 }
 
+// Gets the target language from the user's profile, and caches
+// if for subsequent requests.
+std::string ContextualSearchDelegate::GetTargetLanguage() {
+  if (target_language_.empty()) {
+    Profile* profile = ProfileManager::GetActiveUserProfile();
+    PrefService* prefs = profile->GetPrefs();
+    target_language_ = TranslateService::GetTargetLanguage(prefs);
+    DCHECK(!target_language_.empty());
+  }
+  return target_language_;

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

We should probably get a list of languages, and not just a single one. I would
hate loosing Contextual Search just because I'm reading portuguese pages and
Google thinks that I need to translate words, instead of getting actual results.
That would make Contextual Search much less useful in portuguese for me
(specially if we use the "translate" string as a trigger).

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

Done.

+}
+
 // Decodes the given response from the search term resolution request and sets
 // the value of the given parameters.
-void ContextualSearchDelegate::DecodeSearchTermsFromJsonResponse(
+void ContextualSearchDelegate::DecodeSearchTermFromJsonResponse(
     const std::string& response,
     std::string* search_term,
     std::string* display_text,
     std::string* alternate_term,
     std::string* prevent_preload,
     int* mention_start,
-    int* mention_end) {
+    int* mention_end,
+    std::string* lang) {
   bool contains_xssi_escape = response.find(kXssiEscape) == 0;
   const std::string& proper_json =
       contains_xssi_escape ? response.substr(strlen(kXssiEscape)) : response;
@@ -445,6 +465,7 @@ void ContextualSearchDelegate::DecodeSearchTermsFromJsonResponse(
         static_cast<base::DictionaryValue*>(root.get());
     dict->GetString(kContextualSearchPreventPreload, prevent_preload);
     dict->GetString(kContextualSearchResponseSearchTermParam, search_term);
+    dict->GetString(kContextualSearchResponseLanguageParam, lang);
     // For the display_text, if not present fall back to the "search_term".
     if (!dict->GetString(kContextualSearchResponseDisplayTextParam,
                          display_text)) {