Call IActivityDelegate.onBackPressedAsync.

Bug: 843161
Change-Id: I433cad8d86b34d64de99e13281d84c953d9bf3b1
Reviewed-on: https://chromium-review.googlesource.com/1150225Reviewed-by: Chris Palmer <palmer@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580490}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -171,6 +171,8 @@ public class CustomTabActivity extends ChromeActivity {
 
     private WebappCustomTabTimeSpentLogger mWebappTimeSpentLogger;
 
+    @Nullable
+    private ModuleEntryPoint mModuleEntryPoint;
     @Nullable
     private ActivityDelegate mModuleActivityDelegate;
     @Nullable
@@ -322,6 +324,8 @@ public class CustomTabActivity extends ChromeActivity {
         mLoadModuleCancelRunnable = null;
         if (entryPoint == null) return;
 
+        mModuleEntryPoint = entryPoint;
+
         long createActivityDelegateStartTime = ModuleMetrics.now();
         mModuleActivityDelegate = entryPoint.createActivityDelegate(new ActivityHostImpl(this));
         ModuleMetrics.recordCreateActivityDelegateTime(createActivityDelegateStartTime);
@@ -825,6 +829,7 @@ public class CustomTabActivity extends ChromeActivity {
             mModuleActivityDelegate.onDestroy();
             mModuleActivityDelegate = null;
         }
+        mModuleEntryPoint = null;
         ComponentName moduleComponentName = mIntentDataProvider.getModuleComponentName();
         if (moduleComponentName != null) {
             mConnection.getModuleLoader(moduleComponentName).maybeUnloadModule();
@@ -1010,8 +1015,16 @@ public class CustomTabActivity extends ChromeActivity {
 
         if (exitFullscreenIfShowing()) return true;
 
-        if (mModuleActivityDelegate != null && mModuleActivityDelegate.onBackPressed()) return true;
+        if (mModuleActivityDelegate != null && mModuleEntryPoint.getModuleVersion() >= 2) {
+            mModuleActivityDelegate.onBackPressedAsync(this::handleTabBackNavigation);
+            return true;
+        }
+
+        handleTabBackNavigation();
+        return true;
+    }
 
+    private void handleTabBackNavigation() {
         if (!getToolbarManager().back()) {
             if (getCurrentTabModel().getCount() > 1) {
                 getCurrentTabModel().closeTab(getActivityTab(), false, false, false);
@@ -1020,7 +1033,6 @@ public class CustomTabActivity extends ChromeActivity {
                 finishAndClose(false);
             }
         }
-        return true;
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegate.java

@@ -107,4 +107,12 @@ public class ActivityDelegate {
         }
         return false;
     }
+
+    public void onBackPressedAsync(Runnable notHandledRunnable) {
+        try {
+            mActivityDelegate.onBackPressedAsync(ObjectWrapper.wrap(notHandledRunnable));
+        } catch (RemoteException e) {
+            assert false;
+        }
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityDelegate.aidl

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.customtabs.dynamicmodule;
 
+import org.chromium.chrome.browser.customtabs.dynamicmodule.IObjectWrapper;
+
 interface IActivityDelegate {
   void onCreate(in Bundle savedInstanceState) = 0;
 
@@ -26,4 +28,12 @@ interface IActivityDelegate {
   void onDestroy() = 9;
 
   boolean onBackPressed() = 10;
+
+  /**
+   * Offers an opportunity to handle the back press event. If it is not handled,
+   * the Runnable must be run.
+   *
+   * Introduced in API version 2.
+   */
+  void onBackPressedAsync(in IObjectWrapper /* Runnable */ notHandledRunnable) = 11;
 }