[SharingHub] Don't show custom share sheet for custom tabs

For the initial launch we do not want to show the custom share sheet
for CCTs.

Bug: 1090470
Change-Id: I60ed2bae711adbe93db2e21866db0f7cb1b48c0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284363
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786096}

chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java

@@ -19,7 +19,6 @@ import org.chromium.base.PackageManagerUtils;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.share.ChromeShareExtras;
 import org.chromium.chrome.browser.share.ShareDelegate;
@@ -165,7 +164,7 @@ public class ChromeActionModeHandler {
                 LocaleManager.getInstance().showSearchEnginePromoIfNeeded(
                         TabUtils.getActivity(mTab), callback);
                 mHelper.finishActionMode();
-            } else if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB_V15)
+            } else if (mShareDelegateSupplier.get().isSharingHubV15Enabled()
                     && item.getItemId() == R.id.select_action_menu_share) {
                 mShareDelegateSupplier.get().share(
                         new ShareParams.Builder(mTab.getWindowAndroid(), /*url=*/"", /*title=*/"")

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -450,9 +450,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             getLifecycleDispatcher().register(bottomContainer);
 
             // Should be called after TabModels are initialized.
-            ShareDelegate shareDelegate =
-                    new ShareDelegateImpl(mRootUiCoordinator.getBottomSheetController(),
-                            getActivityTabProvider(), new ShareDelegateImpl.ShareSheetDelegate());
+            ShareDelegate shareDelegate = new ShareDelegateImpl(
+                    mRootUiCoordinator.getBottomSheetController(), getActivityTabProvider(),
+                    new ShareDelegateImpl.ShareSheetDelegate(), isCustomTab());
             mShareDelegateSupplier.set(shareDelegate);
 
             // If onStart was called before postLayoutInflation (because inflation was done in a

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -815,7 +815,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
      */
     private void shareImage(RenderFrameHost renderFrameHost, String srcUrl) {
         retrieveImage(renderFrameHost, ContextMenuImageFormat.ORIGINAL, (Uri imageUri) -> {
-            if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB_V15)) {
+            if (!mShareDelegateSupplier.get().isSharingHubV15Enabled()) {
                 ShareHelper.shareImage(getWindow(), null, imageUri);
                 return;
             }

chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegate.java

@@ -26,4 +26,14 @@ public interface ShareDelegate {
      * @param shareDirectly If this share should be sent directly to the last used share target.
      */
     void share(Tab currentTab, boolean shareDirectly);
+
+    /**
+     * Check if the custom share sheet is enabled.
+     */
+    boolean isSharingHubV1Enabled();
+
+    /**
+     * Check if v1.5 of the custom share sheet is enabled.
+     */
+    boolean isSharingHubV15Enabled();
 }

chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java

@@ -52,6 +52,7 @@ public class ShareDelegateImpl implements ShareDelegate {
     private final ShareSheetDelegate mDelegate;
     private final Supplier<Tab> mTabProvider;
     private long mShareStartTime;
+    private boolean mIsCustomTab;
 
     private static boolean sScreenshotCaptureSkippedForTesting;
 
@@ -61,12 +62,14 @@ public class ShareDelegateImpl implements ShareDelegate {
      * @param controller The BottomSheetController for the current activity.
      * @param tabProvider Supplier for the current activity tab.
      * @param delegate The ShareSheetDelegate for the current activity.
+     * @param isCustomTab This share delegate is associated with a CCT.
      */
     public ShareDelegateImpl(BottomSheetController controller, Supplier<Tab> tabProvider,
-            ShareSheetDelegate delegate) {
+            ShareSheetDelegate delegate, boolean isCustomTab) {
         mBottomSheetController = controller;
         mDelegate = delegate;
         mTabProvider = tabProvider;
+        mIsCustomTab = isCustomTab;
     }
 
     // ShareDelegate implementation.
@@ -76,7 +79,7 @@ public class ShareDelegateImpl implements ShareDelegate {
             mShareStartTime = System.currentTimeMillis();
         }
         mDelegate.share(params, chromeShareExtras, mBottomSheetController, mTabProvider,
-                this::printTab, mShareStartTime);
+                this::printTab, mShareStartTime, isSharingHubV1Enabled());
         mShareStartTime = 0;
     }
 
@@ -265,6 +268,17 @@ public class ShareDelegateImpl implements ShareDelegate {
         }
     }
 
+    @Override
+    public boolean isSharingHubV1Enabled() {
+        return !mIsCustomTab && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB);
+    }
+
+    @Override
+    public boolean isSharingHubV15Enabled() {
+        return isSharingHubV1Enabled()
+                && ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB);
+    }
+
     /**
      * Delegate for share handling.
      */
@@ -274,10 +288,10 @@ public class ShareDelegateImpl implements ShareDelegate {
          */
         void share(ShareParams params, ChromeShareExtras chromeShareExtras,
                 BottomSheetController controller, Supplier<Tab> tabProvider,
-                Callback<Tab> printCallback, long shareStartTime) {
+                Callback<Tab> printCallback, long shareStartTime, boolean sharingHubEnabled) {
             if (chromeShareExtras.shareDirectly()) {
                 ShareHelper.shareWithLastUsedComponent(params);
-            } else if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SHARING_HUB)) {
+            } else if (sharingHubEnabled) {
                 ShareSheetCoordinator coordinator =
                         new ShareSheetCoordinator(controller, tabProvider,
                                 new ShareSheetPropertyModelBuilder(controller,

chrome/android/javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplIntegrationTest.java

@@ -119,14 +119,15 @@ public class ShareDelegateImplIntegrationTest {
                 @Override
                 void share(ShareParams params, ChromeShareExtras chromeShareParams,
                         BottomSheetController controller, Supplier<Tab> tabProvider,
-                        Callback<Tab> printCallback, long shareStartTime) {
+                        Callback<Tab> printCallback, long shareStartTime,
+                        boolean sharingHubEnabled) {
                     paramsRef.set(params);
                     helper.notifyCalled();
                 }
             };
 
             new ShareDelegateImpl(mActivityTestRule.getActivity().getBottomSheetController(),
-                    mActivityTestRule.getActivity().getActivityTabProvider(), delegate)
+                    mActivityTestRule.getActivity().getActivityTabProvider(), delegate, false)
                     .share(mActivityTestRule.getActivity().getActivityTab(), false);
         });
         helper.waitForCallback(0);