[Custom Tabs] Implement "Read It Later" Behind a Flag

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.customtabs;
 
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ skipping 14 matching lines @@
 import android.widget.RemoteViews;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
 import org.chromium.chrome.browser.KeyboardShortcuts;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
 import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
@@ skipping 545 matching lines @@
                 params.getDescription(),
                 new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         String creatorPackage =
                                 ApiCompatibilityUtils.getCreatorPackage(params.getPendingIntent());
                         if (mIntentDataProvider.isOpenedByChrome()
                                 && TextUtils.equals(getPackageName(), creatorPackage)) {
                             RecordUserAction.record(
                                     "TaskManagement.OpenInChromeActionButtonClicked");
-                            if (openCurrentUrlInBrowser(false)) finishAndClose();
+                            if (openCurrentUrlInBrowser(false, true)) finishAndClose();
                         } else {
                             mIntentDataProvider.sendButtonPendingIntentWithUrl(
                                     getApplicationContext(), getActivityTab().getUrl());
                             RecordUserAction.record("CustomTabsCustomActionButtonClick");
                         }
                     }
                 });
     }
 
     @Override
@@ skipping 40 matching lines @@
         // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
         if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
                 || id == R.id.print_id || id == R.id.help_id
                 || id == R.id.recent_tabs_menu_id || id == R.id.new_incognito_tab_menu_id
                 || id == R.id.new_tab_menu_id || id == R.id.open_history_menu_id) {
             return true;
         } else if (id == R.id.bookmark_this_page_id
                 && !mIntentDataProvider.shouldShowBookmarkMenuItem()) {
             return true;
         } else if (id == R.id.open_in_browser_id) {
-            openCurrentUrlInBrowser(false);
+            openCurrentUrlInBrowser(false, true);
             RecordUserAction.record("CustomTabsMenuOpenInChrome");
             return true;
+        } else if (id == R.id.read_it_later_id) {
+            openCurrentUrlInBrowser(false, false);
+            RecordUserAction.record("CustomTabsMenuReadItLater");
+            return true;
         } else if (id == R.id.find_in_page_id) {
             mFindToolbarManager.showToolbar();
             if (getContextualSearchManager() != null) {
                 getContextualSearchManager().hideContextualSearch(StateChangeReason.UNKNOWN);
             }
             if (fromMenu) {
                 RecordUserAction.record("MobileMenuFindInPage");
             } else {
                 RecordUserAction.record("MobileShortcutFindInPage");
             }
@@ skipping 32 matching lines @@
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
 
     /**
      * Opens the URL currently being displayed in the Custom Tab in the regular browser.
      * @param forceReparenting Whether tab reparenting should be forced for testing.
-     *
+     * @param stayInChrome     Whether the user stays in Chrome after the tab is reparented.
      * @return Whether or not the tab was sent over successfully.
      */
-    boolean openCurrentUrlInBrowser(boolean forceReparenting) {
+    boolean openCurrentUrlInBrowser(boolean forceReparenting, boolean stayInChrome) {
         Tab tab = getActivityTab();
         if (tab == null) return false;
 
         String url = tab.getUrl();
         if (DomDistillerUrlUtils.isDistilledPage(url)) {
             url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
         }
         if (TextUtils.isEmpty(url)) url = getUrlToLoad();
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ChromeLauncherActivity.EXTRA_IS_ALLOWED_TO_RETURN_TO_PARENT, false);
+        if (ChromeFeatureList.isEnabled("ReadItLaterInMenu")) {
+            // In this trial both "open in chrome" and "read it later" should target Chrome.
+            intent.setPackage(getPackageName());
+        }
 
         boolean willChromeHandleIntent = getIntentDataProvider().isOpenedByChrome();
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         StrictMode.allowThreadDiskWrites();
         try {
             willChromeHandleIntent |= ExternalNavigationDelegateImpl
                     .willChromeHandleIntent(this, intent, true);
         } finally {
             StrictMode.setThreadPolicy(oldPolicy);
         }
 
         Bundle startActivityOptions = ActivityOptionsCompat.makeCustomAnimation(
                 this, R.anim.abc_fade_in, R.anim.abc_fade_out).toBundle();
         if (willChromeHandleIntent || forceReparenting) {
             Runnable finalizeCallback = new Runnable() {
                 @Override
                 public void run() {
                     finishAndClose();
                 }
             };
 
             mMainTab = null;
-            tab.detachAndStartReparenting(intent, startActivityOptions, finalizeCallback);
+            tab.detachAndStartReparenting(intent, startActivityOptions, finalizeCallback,
+                    stayInChrome);
         } else {
             // Temporarily allowing disk access while fixing. TODO: http://crbug.com/581860
             StrictMode.allowThreadDiskReads();
             StrictMode.allowThreadDiskWrites();
             try {
                 startActivity(intent, startActivityOptions);
             } finally {
                 StrictMode.setThreadPolicy(oldPolicy);
             }
         }
@@ skipping 43 matching lines @@
      *         overridden if the Data Reduction Proxy is using Lo-Fi previews.
      */
     private String getUrlToLoad() {
         String url = IntentHandler.getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(url)) {
             url = DataReductionProxySettings.getInstance().maybeRewriteWebliteUrl(url);
         }
         return url;
     }
 }