| 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 d1e0c4493720263ac63bf55b98fbe280be552d03..62d956c2787bad1c29cd2ae5432bb3f23261e696 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
|
| @@ -656,23 +656,27 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega
|
| * @param contextLanguage The language of the original search term, or an empty string.
|
| * @param thumbnailUrl The URL of the thumbnail to display in our UX.
|
| * @param caption The caption to display.
|
| + * @param quickActionUri The URI for the intent associated with the quick action.
|
| + * @param quickActionCategory The category for the quick action.
|
| */
|
| @CalledByNative
|
| public void onSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,
|
| final String searchTerm, final String displayText, final String alternateTerm,
|
| final String mid, boolean doPreventPreload, int selectionStartAdjust,
|
| int selectionEndAdjust, final String contextLanguage, final String thumbnailUrl,
|
| - final String caption) {
|
| + final String caption, final String quickActionUri, final String quickActionCategory) {
|
| mNetworkCommunicator.handleSearchTermResolutionResponse(isNetworkUnavailable, responseCode,
|
| searchTerm, displayText, alternateTerm, mid, doPreventPreload, selectionStartAdjust,
|
| - selectionEndAdjust, contextLanguage, thumbnailUrl, caption);
|
| + selectionEndAdjust, contextLanguage, thumbnailUrl, caption, quickActionUri,
|
| + quickActionCategory);
|
| }
|
|
|
| @Override
|
| public void handleSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,
|
| String searchTerm, String displayText, String alternateTerm, String mid,
|
| boolean doPreventPreload, int selectionStartAdjust, int selectionEndAdjust,
|
| - String contextLanguage, String thumbnailUrl, String caption) {
|
| + String contextLanguage, String thumbnailUrl, String caption, String quickActionUri,
|
| + String quickActionCategory) {
|
| // Show an appropriate message for what to search for.
|
| String message;
|
| boolean doLiteralSearch = false;
|
| @@ -692,7 +696,8 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega
|
| doLiteralSearch = true;
|
| }
|
|
|
| - mSearchPanel.onSearchTermResolved(message, thumbnailUrl);
|
| + mSearchPanel.onSearchTermResolved(message, thumbnailUrl, quickActionUri,
|
| + quickActionCategory);
|
| if (!TextUtils.isEmpty(caption)) {
|
| // Call #onSetCaption() to set the caption. For entities, the caption should not be
|
| // regarded as an answer. In the future, when quick actions are added, doesAnswer will
|
|
|