Search in Chrome Shortcut now accepts input

Make search in chrome accept a string input that will be searched in any search engine of user's choice

Bug: 1106922

Change-Id: I4bb79e8f0d77b04d1cf79cda83cbe87fe00eabb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297731
Commit-Queue: Andy Lu <andyhylu@google.com>
Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Guillaume Jenkins <gujen@google.com>
Cr-Commit-Position: refs/heads/master@{#790037}

ios/chrome/app/application_delegate/user_activity_handler.mm

@@ -20,6 +20,7 @@
 #import "ios/chrome/app/application_delegate/tab_opening.h"
 #include "ios/chrome/app/application_mode.h"
 #import "ios/chrome/app/intents/OpenInChromeIntent.h"
+#import "ios/chrome/app/intents/SearchInChromeIntent.h"
 #import "ios/chrome/app/spotlight/actions_spotlight_manager.h"
 #import "ios/chrome/app/spotlight/spotlight_util.h"
 #include "ios/chrome/app/startup/chrome_app_startup_parameters.h"
@@ -144,10 +145,23 @@ NSString* const kShortcutQRScanner = @"OpenQRScanner";
   } else if ([userActivity.activityType
                  isEqualToString:@"SearchInChromeIntent"]) {
     base::RecordAction(UserMetricsAction("IOSLaunchedBySearchInChromeIntent"));
+
     AppStartupParameters* startupParams = [[AppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
                 completeURL:GURL(kChromeUINewTabURL)];
-    [startupParams setPostOpeningAction:FOCUS_OMNIBOX];
+
+    SearchInChromeIntent* intent =
+        base::mac::ObjCCastStrict<SearchInChromeIntent>(
+            userActivity.interaction.intent);
+
+    NSString* searchPhrase = intent.searchPhrase;
+
+    if ([searchPhrase length]) {
+      startupParams.textQuery = searchPhrase;
+    } else {
+      startupParams.postOpeningAction = FOCUS_OMNIBOX;
+    }
+
     [connectionInformation setStartupParameters:startupParams];
     webpageURL =
         [NSURL URLWithString:base::SysUTF8ToNSString(kChromeUINewTabURL)];

ios/chrome/app/intents/Intents.intentdefinition

@@ -107,28 +107,69 @@
 		<dict>
 			<key>INIntentCategory</key>
 			<string>information</string>
+			<key>INIntentConfigurable</key>
+			<true/>
 			<key>INIntentDescriptionID</key>
 			<string>k0Ho6W</string>
-			<key>INIntentName</key>
-			<string>SearchInChrome</string>
-			<key>INIntentParameterCombinations</key>
+			<key>INIntentIneligibleForSuggestions</key>
+			<true/>
+			<key>INIntentInput</key>
+			<string>searchPhrase</string>
+			<key>INIntentLastParameterTag</key>
+			<integer>1</integer>
+			<key>INIntentManagedParameterCombinations</key>
 			<dict>
-				<key></key>
+				<key>searchPhrase</key>
 				<dict>
-					<key>INIntentParameterCombinationIsPrimary</key>
-					<true/>
-					<key>INIntentParameterCombinationSubtitle</key>
-					<string>Start a search in a new Chrome tab.</string>
-					<key>INIntentParameterCombinationSubtitleID</key>
-					<string>4nGj7v</string>
 					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
-					<false/>
+					<true/>
 					<key>INIntentParameterCombinationTitle</key>
-					<string>Search in Chrome</string>
+					<string>Search ${searchPhrase} in Chrome</string>
 					<key>INIntentParameterCombinationTitleID</key>
-					<string>ceiocv</string>
+					<string>TqBLdA</string>
+					<key>INIntentParameterCombinationUpdatesLinked</key>
+					<true/>
 				</dict>
 			</dict>
+			<key>INIntentName</key>
+			<string>SearchInChrome</string>
+			<key>INIntentParameters</key>
+			<array>
+				<dict>
+					<key>INIntentParameterDisplayName</key>
+					<string>Search phrase</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>bsFAEt</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>1</integer>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataCapitalization</key>
+						<string>Sentences</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>searchPhrase</string>
+					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogFormatString</key>
+							<string>What do you want to search?</string>
+							<key>INIntentParameterPromptDialogFormatStringID</key>
+							<string>rIYS61</string>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsResolution</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>1</integer>
+					<key>INIntentParameterType</key>
+					<string>String</string>
+				</dict>
+			</array>
 			<key>INIntentResponse</key>
 			<dict>
 				<key>INIntentResponseCodes</key>

ios/chrome/app/resources/chrome_localize_strings_config.plist

@@ -46,6 +46,12 @@
 					<key>output</key>
 					<string>Z6KvRw</string>
 				</dict>
+                <dict>
+                    <key>input</key>
+                    <string>IDS_IOS_INTENTS_SEARCH_IN_CHROME_PARAMETER_COMBINATION_TITLE</string>
+                    <key>output</key>
+                    <string>TqBLdA</string>
+                </dict>
 				<dict>
 					<key>input</key>
 					<string>IDS_IOS_INTENTS_OPEN_IN_CHROME_PARAMETER_COMBINATION_TITLE</string>

ios/chrome/app/strings/ios_strings.grd

@@ -918,7 +918,11 @@ Because your account is managed by <ph name="HOSTED_DOMAIN">$1<ex>google.com</ex
         Search in Chrome
       </message>
       <message name="IDS_IOS_INTENTS_SEARCH_IN_CHROME_TITLE" desc="Siri Shortcut for search in chrome title [iOS only].">
-        Search in Chrome
+          Search in Chrome
+      </message>
+      <message name="IDS_IOS_INTENTS_SEARCH_IN_CHROME_PARAMETER_COMBINATION_TITLE" desc="Apple Shortcuts App's format for displaying the user search phrase input, shown by the Siri Shortcut app when the
+          user is adding or editing a Search in Chrome shortcut[iOS only].">
+          Search ${searchPhrase} in Chrome
       </message>
       <message name="IDS_IOS_JAVA_SCRIPT_DIALOG_BLOCKING_BUTTON_TEXT" desc="The text used for the button added to JavaScript dialogs to prevent a page from spamming the user with endless alerts. [Length:27em]">
         Suppress Dialogs

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_INTENTS_SEARCH_IN_CHROME_PARAMETER_COMBINATION_TITLE.png.sha1

+45f78256bc7c591ecb43b6e2989c1981ea45a6cf
\ No newline at end of file