[Autofill Assistant] Hook up script selection.

Connect selecting a script in the UI with the native side so that it can
be routed to the executor.

R=gogerald@chromium.org, szermatt@chromium.org

Bug: 806868
Change-Id: Icf85027c2e50a073d805dbcb3e99017ce66b5850
Reviewed-on: https://chromium-review.googlesource.com/1206373Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589719}

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java

@@ -19,7 +19,7 @@ import org.chromium.content_public.browser.WebContents;
  * Autofill Assistant related UIs and forward UI events to native side.
  */
 @JNINamespace("autofill_assistant")
-public class AutofillAssistantUiController {
+public class AutofillAssistantUiController implements BottomBarController.Client {
     private final long mUiControllerAndroid;
     private final BottomBarController mBottomBarController;
 
@@ -58,7 +58,12 @@ public class AutofillAssistantUiController {
             }
         });
 
-        mBottomBarController = new BottomBarController(activity);
+        mBottomBarController = new BottomBarController(activity, this);
+    }
+
+    @Override
+    public void onScriptSelected(String scriptPath) {
+        nativeOnScriptSelected(mUiControllerAndroid, scriptPath);
     }
 
     @CalledByNative
@@ -86,4 +91,5 @@ public class AutofillAssistantUiController {
     // native methods.
     private native long nativeInit(WebContents webContents);
     private native void nativeDestroy(long nativeUiControllerAndroid);
+    private native void nativeOnScriptSelected(long nativeUiControllerAndroid, String scriptPath);
 }

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/BottomBarController.java

@@ -23,17 +23,34 @@ class BottomBarController {
     private static final String SCRIPTS_STATUS_MESSAGE = "Scripts";
 
     private final Activity mActivity;
+    private final Client mClient;
     private final LinearLayout mBottomBar;
     private ViewGroup mScriptsViewContainer;
     private TextView mStatusMessageView;
 
+    /**
+     * This is a client interface that relays interactions from the UI.
+     *
+     * Java version of the native autofill_assistant::UiDelegate.
+     */
+    public interface Client {
+        /**
+         * Called when a script has been selected.
+         *
+         * @param scriptPath The path for the selected script.
+         */
+        void onScriptSelected(String scriptPath);
+    }
+
     /**
      * Constructs a bottom bar.
      *
      * @param activity The Activity
+     * @param client The client to forward events to
      */
-    public BottomBarController(Activity activity) {
+    public BottomBarController(Activity activity, Client client) {
         mActivity = activity;
+        mClient = client;
 
         mBottomBar = createBottomBar();
         ((ViewGroup) mActivity.findViewById(R.id.coordinator)).addView(mBottomBar);
@@ -64,9 +81,10 @@ class BottomBarController {
         if (scripts.length == 0) {
             return;
         }
-
         for (String script : scripts) {
-            mScriptsViewContainer.addView(createScriptView(script));
+            TextView scriptView = createScriptView(script);
+            scriptView.setOnClickListener((unusedView) -> { mClient.onScriptSelected(script); });
+            mScriptsViewContainer.addView(scriptView);
         }
     }
 

chrome/browser/android/autofill_assistant/ui_controller_android.cc

@@ -75,6 +75,15 @@ void UiControllerAndroid::UpdateScripts(
       env, java_autofill_assistant_ui_controller_, jscripts);
 }
 
+void UiControllerAndroid::OnScriptSelected(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jcaller,
+    const JavaParamRef<jstring>& jscript_path) {
+  std::string script_path;
+  base::android::ConvertJavaStringToUTF8(env, jscript_path, &script_path);
+  ui_delegate_->OnScriptSelected(script_path);
+}
+
 void UiControllerAndroid::ChooseAddress(
     base::OnceCallback<void(const std::string&)> callback) {
   // TODO(crbug.com/806868): Implement ChooseAddress.

chrome/browser/android/autofill_assistant/ui_controller_android.h

@@ -38,6 +38,10 @@ class UiControllerAndroid : public UiController, public Client {
 
   // Called by Java.
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
+  void OnScriptSelected(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& jcaller,
+      const base::android::JavaParamRef<jstring>& jscript_path);
 
  private:
   // Java-side AutofillAssistantUiController object.

components/autofill_assistant/browser/controller.cc

@@ -77,6 +77,10 @@ void Controller::OnClickOverlay() {
   // TODO(crbug.com/806868): Stop executing scripts.
 }
 
+void Controller::OnScriptSelected(const std::string& script_path) {
+  // TODO(crbug.com/806868): Forward to the execution engine.
+}
+
 void Controller::OnDestroy() {
   delete this;
 }

components/autofill_assistant/browser/controller.h

@@ -52,6 +52,7 @@ class Controller : public ScriptExecutorDelegate,
   // Overrides content::UiDelegate:
   void OnClickOverlay() override;
   void OnDestroy() override;
+  void OnScriptSelected(const std::string& script_path) override;
 
   // Overrides ScriptTracker::Listener:
   void OnRunnableScriptsChanged(

components/autofill_assistant/browser/ui_delegate.h

@@ -5,6 +5,8 @@
 #ifndef COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_UI_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_ASSISTANT_BROWSER_UI_DELEGATE_H_
 
+#include <string>
+
 namespace autofill_assistant {
 // UI delegate called for script executions.
 class UiDelegate {
@@ -18,6 +20,9 @@ class UiDelegate {
   // detached from the associated activity.
   virtual void OnDestroy() = 0;
 
+  // Called when a script has been selected.
+  virtual void OnScriptSelected(const std::string& script_path) = 0;
+
  protected:
   UiDelegate() = default;
 };