Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java |
index 6ee72c4d7ddf173911a4f9a53bb5cd7cdf9612ab..02df280e7f4313724910fa4b42a9680f4f73832f 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java |
@@ -5,6 +5,7 @@ |
package org.chromium.chrome.browser.contextualsearch; |
import android.app.Activity; |
+import android.content.Context; |
import android.view.View; |
import android.view.ViewGroup; |
import android.view.ViewTreeObserver; |
@@ -49,10 +50,13 @@ import org.chromium.content_public.browser.LoadUrlParams; |
import org.chromium.content_public.browser.NavigationEntry; |
import org.chromium.content_public.browser.WebContentsObserver; |
import org.chromium.content_public.common.TopControlsState; |
+import org.chromium.ui.UiUtils; |
import org.chromium.ui.base.WindowAndroid; |
import java.net.MalformedURLException; |
import java.net.URL; |
+import java.util.ArrayList; |
+import java.util.List; |
import javax.annotation.Nullable; |
@@ -492,6 +496,7 @@ public class ContextualSearchManager extends ContextualSearchObservable |
boolean shouldPrefetch = mPolicy.shouldPrefetchSearchResult(isTap); |
mSearchRequest = new ContextualSearchRequest(mSelectionController.getSelectedText(), |
null, shouldPrefetch); |
+ // TODO(donnd): figure out a way to do translation on long-press selections. |
mDidStartLoadingResolvedSearchRequest = false; |
mSearchPanelDelegate.displaySearchTerm(mSelectionController.getSelectedText()); |
if (shouldPrefetch) loadSearchUrl(); |
@@ -689,20 +694,22 @@ public class ContextualSearchManager extends ContextualSearchObservable |
* selection should be expanded by. |
* @param selectionEndAdjust A positive number of characters that the end of the existing |
* selection should be expanded by. |
+ * @param contextLanguage The language of the original search term, or an empty string. |
*/ |
@CalledByNative |
public void onSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode, |
final String searchTerm, final String displayText, final String alternateTerm, |
- boolean doPreventPreload, int selectionStartAdjust, int selectionEndAdjust) { |
+ boolean doPreventPreload, int selectionStartAdjust, int selectionEndAdjust, |
+ final String contextLanguage) { |
mNetworkCommunicator.handleSearchTermResolutionResponse(isNetworkUnavailable, responseCode, |
searchTerm, displayText, alternateTerm, doPreventPreload, selectionStartAdjust, |
- selectionEndAdjust); |
+ selectionEndAdjust, contextLanguage); |
} |
@Override |
public void handleSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode, |
String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload, |
- int selectionStartAdjust, int selectionEndAdjust) { |
+ int selectionStartAdjust, int selectionEndAdjust, String contextLanguage) { |
if (!mSearchPanelDelegate.isShowing()) return; |
// Show an appropriate message for what to search for. |
@@ -735,6 +742,12 @@ public class ContextualSearchManager extends ContextualSearchObservable |
// appear in the user's history until the user views it). See crbug.com/406446. |
boolean shouldPreload = !doPreventPreload && mPolicy.shouldPrefetchSearchResult(true); |
mSearchRequest = new ContextualSearchRequest(searchTerm, alternateTerm, shouldPreload); |
+ if (!contextLanguage.isEmpty() && mPolicy.isTranslationEnabled()) { |
+ List<String> targetLanguages = getTargetLocales(); |
+ if (mPolicy.needsTranslation(contextLanguage, targetLanguages)) { |
+ mSearchRequest.forceTranslation(contextLanguage, targetLanguages.get(0)); |
+ } |
+ } |
mDidStartLoadingResolvedSearchRequest = false; |
if (mSearchPanelDelegate.isContentViewShowing()) { |
mSearchRequest.setNormalPriority(); |
@@ -781,6 +794,26 @@ public class ContextualSearchManager extends ContextualSearchObservable |
return mPolicy.isTapSupported(); |
} |
+ /** |
+ * Gets the list of target locales for the user, with the first |
+ * item in the list being the user's primary locale. |
+ * @return The {@link List} of languages the user understands with their primary language first. |
+ */ |
+ private List<String> getTargetLocales() { |
+ List<String> result; |
+ String primaryLanguage = nativeGetTargetLanguage(mNativeContextualSearchManagerPtr); |
+ Context context = mSearchPanelDelegate.getContext(); |
+ if (context == null) { |
+ result = new ArrayList<String>(); |
+ } else { |
+ result = UiUtils.getIMELocales(context); |
+ } |
+ // Make sure the primary language list the first in the list. |
+ result.remove(primaryLanguage); |
+ result.add(primaryLanguage); |
+ return result; |
+ } |
+ |
// ============================================================================================ |
// OverlayContentDelegate |
// ============================================================================================ |
@@ -1228,4 +1261,5 @@ public class ContextualSearchManager extends ContextualSearchObservable |
private native void nativeGatherSurroundingText(long nativeContextualSearchManager, |
String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore, |
boolean maySendBasePageUrl); |
+ private native String nativeGetTargetLanguage(long nativeContextualSearchManager); |
} |