Allow Reader Mode specific customization in incognito CCT.

This CL allows READER_MODE to:

a) Remove top row action icon menu:
   Forward, Refresh, pageinfo, Bookmark.

b) Menu item to contain only "Find in page" and a custom menu item
   "Appearance".

Screenshot: crbug.com/1128856#c1
Bug: 1128856
Change-Id: I9624da87b9a95a22a2fe0b4eb67c6676214b8ed1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2426484
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810262}

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

@@ -11,10 +11,13 @@ import static org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider
 import static org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider.EXTRA_UI_TYPE;
 import static org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider.isTrustedCustomTab;
 
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Pair;
 
 import androidx.annotation.Nullable;
 import androidx.browser.customtabs.CustomTabsIntent;
@@ -29,6 +32,9 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.components.browser_ui.widget.TintedDrawable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A model class that parses the incoming intent for incognito Custom Tabs specific customization
  * data.
@@ -38,21 +44,26 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
  * to activity re-creation.
  */
 public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentDataProvider {
+    private static final int MAX_CUSTOM_MENU_ITEMS = 5;
+
     private final Intent mIntent;
     private final CustomTabsSessionToken mSession;
     private final boolean mIsTrustedIntent;
     private final Bundle mAnimationBundle;
-    @Nullable
-    private final String mUrlToLoad;
-
     private final int mToolbarColor;
     private final int mBottomBarColor;
     private final Drawable mCloseButtonIcon;
     private final boolean mShowShareItem;
+    private final List<Pair<String, PendingIntent>> mMenuEntries = new ArrayList<>();
+
+    @Nullable
+    private final String mUrlToLoad;
 
     /** Whether this CustomTabActivity was explicitly started by another Chrome Activity. */
     private final boolean mIsOpenedByChrome;
 
+    private final @CustomTabsUiType int mUiType;
+
     /**
      * Constructs a {@link IncognitoCustomTabIntentDataProvider}.
      * Incognito CCT would have a fix color scheme.
@@ -74,6 +85,16 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
         mCloseButtonIcon = TintedDrawable.constructTintedDrawable(context, R.drawable.btn_close);
         mShowShareItem = IntentUtils.safeGetBooleanExtra(
                 intent, CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, false);
+
+        mUiType = getUiType(intent);
+        updateExtraMenuItemsIfNecessary(intent);
+    }
+
+    private static @CustomTabsUiType int getUiType(Intent intent) {
+        if (isForPaymentsFlow(intent)) return CustomTabsUiType.PAYMENT_REQUEST;
+        if (isForReaderMode(intent)) return CustomTabsUiType.READER_MODE;
+
+        return CustomTabsUiType.DEFAULT;
     }
 
     private static boolean isIncognitoRequested(Intent intent) {
@@ -82,13 +103,44 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     private static boolean isForPaymentsFlow(Intent intent) {
+        final int requestedUiType =
+                IntentUtils.safeGetIntExtra(intent, EXTRA_UI_TYPE, CustomTabsUiType.DEFAULT);
+        return (isTrustedIntent(intent) && (requestedUiType == CustomTabsUiType.PAYMENT_REQUEST));
+    }
+
+    private static boolean isForReaderMode(Intent intent) {
+        final int requestedUiType =
+                IntentUtils.safeGetIntExtra(intent, EXTRA_UI_TYPE, CustomTabsUiType.DEFAULT);
+        return (isTrustedIntent(intent) && (requestedUiType == CustomTabsUiType.READER_MODE));
+    }
+
+    private static boolean isTrustedIntent(Intent intent) {
         CustomTabsSessionToken session = CustomTabsSessionToken.getSessionTokenFromIntent(intent);
         boolean isOpenedByChrome =
                 IntentUtils.safeGetBooleanExtra(intent, EXTRA_IS_OPENED_BY_CHROME, false);
-        final int requestedUiType =
-                IntentUtils.safeGetIntExtra(intent, EXTRA_UI_TYPE, CustomTabsUiType.DEFAULT);
-        return (isTrustedCustomTab(intent, session) && isOpenedByChrome
-                && (requestedUiType == CustomTabsUiType.PAYMENT_REQUEST));
+        return isTrustedCustomTab(intent, session) && isOpenedByChrome;
+    }
+
+    private static boolean isAllowedToAddCustomMenuItem(Intent intent) {
+        // Only READER_MODE is supported for now.
+        return isForReaderMode(intent);
+    }
+
+    private void updateExtraMenuItemsIfNecessary(Intent intent) {
+        if (!isAllowedToAddCustomMenuItem(intent)) return;
+
+        List<Bundle> menuItems =
+                IntentUtils.getParcelableArrayListExtra(intent, CustomTabsIntent.EXTRA_MENU_ITEMS);
+        if (menuItems == null) return;
+
+        for (int i = 0; i < Math.min(MAX_CUSTOM_MENU_ITEMS, menuItems.size()); i++) {
+            Bundle bundle = menuItems.get(i);
+            String title = IntentUtils.safeGetString(bundle, CustomTabsIntent.KEY_MENU_ITEM_TITLE);
+            PendingIntent pendingIntent =
+                    IntentUtils.safeGetParcelable(bundle, CustomTabsIntent.KEY_PENDING_INTENT);
+            if (TextUtils.isEmpty(title) || pendingIntent == null) continue;
+            mMenuEntries.add(new Pair<String, PendingIntent>(title, pendingIntent));
+        }
     }
 
     // TODO(https://crbug.com/1023759): Remove this function and enable
@@ -204,4 +256,19 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     public boolean isIncognito() {
         return true;
     }
+
+    @Override
+    @CustomTabsUiType
+    public int getUiType() {
+        return mUiType;
+    }
+
+    @Override
+    public List<String> getMenuTitles() {
+        ArrayList<String> list = new ArrayList<>();
+        for (Pair<String, PendingIntent> pair : mMenuEntries) {
+            list.add(pair.first);
+        }
+        return list;
+    }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityIncognitoTest.java

@@ -138,7 +138,7 @@ public class CustomTabActivityIncognitoTest {
         assertTrue(item == null || !item.isVisible());
     }
 
-    private void testTopActionIconsIsVisible(String screenshotName) throws Exception {
+    private void testTopActionIconsIsVisible() throws Exception {
         Menu menu = mCustomTabActivityTestRule.getMenu();
         MenuItem iconRow = menu.findItem(R.id.icon_row_menu_id);
 
@@ -261,7 +261,7 @@ public class CustomTabActivityIncognitoTest {
     @Features.EnableFeatures({ChromeFeatureList.CCT_INCOGNITO})
     public void ensureOnlyFourTopIconsAreVisible() throws Exception {
         launchMenuItem();
-        testTopActionIconsIsVisible("Forward, info, bookmark and reload is visible");
+        testTopActionIconsIsVisible();
     }
 
     @Test
@@ -281,7 +281,26 @@ public class CustomTabActivityIncognitoTest {
         assertTrue(menu.findItem(R.id.request_desktop_site_row_menu_id).isVisible());
 
         // Check top icons are still the same.
-        testTopActionIconsIsVisible("Custom menu items not visible");
+        testTopActionIconsIsVisible();
+    }
+
+    @Test
+    @MediumTest
+    @Features.EnableFeatures({ChromeFeatureList.CCT_INCOGNITO})
+    public void ensureAddCustomMenuItemIsEnabledForReaderMode() throws Exception {
+        Intent intent = createMinimalIncognitoCustomTabIntent();
+        CustomTabIntentDataProvider.addReaderModeUIExtras(intent);
+        CustomTabActivity activity = launchIncognitoCustomTab(intent);
+        CustomTabsTestUtils.openAppMenuAndAssertMenuShown(activity);
+
+        Menu menu = mCustomTabActivityTestRule.getMenu();
+        // Check the menu items have only 2 items visible "not" including the top icon row menu.
+        assertEquals(2, CustomTabsTestUtils.getVisibleMenuSize(menu));
+        assertTrue(menu.findItem(R.id.reader_mode_prefs_id).isVisible());
+        assertTrue(menu.findItem(R.id.find_in_page_id).isVisible());
+
+        assertFalse(menu.findItem(R.id.icon_row_menu_id).isVisible());
+        assertFalse(menu.findItem(R.id.request_desktop_site_row_menu_id).isVisible());
     }
 
     @Test