Herb: Show an icon allowing the user to open a tab in Chrome

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.app.PendingIntent.CanceledException;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 21 matching lines @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 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;
+import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.widget.FadingShadow;
 import org.chromium.chrome.browser.widget.FadingShadowView;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.PageTransition;
 
 import java.util.List;
 
 /**
  * The activity for custom tabs. It will be launched on top of a client's task.
  */
 public class CustomTabActivity extends ChromeActivity {
     private static final String TAG = "CustomTabActivity";
+
+    /**
+     * Extra used by Chrome to tell the CustomTabActivity to finish itself and open the current URL
+     * in Chrome.  Guarded explicitly for use only by PendingIntents with the Chrome package.
+     */
+    public static final String EXTRA_ALLOW_OPEN_IN_BROWSER =
+            "org.chromium.chrome.browser.customtabs.ALLOW_OPEN_IN_BROWSER";

[Ian Wen, 2016/02/10 22:08:40]

Move this extra to CustomTabsIntentDataProvider, which is the only place that
CCT parses intent data.

Also maybe we should rename this extra to "finish after action button click" or
"finish after open in browser"? Opening in browser is always allowed in CCT and
the name is slightly confounding.

[gone, 2016/02/10 22:28:24]

Went with FINISH_AFTER_OPENING_IN_BROWSER.  We'll probably need a better way to
have Chrome-specific actions triggered by Custom Tabs if this prototype sticks.

+
     private static CustomTabContentHandler sActiveContentHandler;
 
     private FindToolbarManager mFindToolbarManager;
     private CustomTabIntentDataProvider mIntentDataProvider;
     private IBinder mSession;
     private CustomTabContentHandler mCustomTabContentHandler;
 
     // This is to give the right package name while using the client's resources during an
     // overridePendingTransition call.
     // TODO(ianwen, yusufo): Figure out a solution to extract external resources without having to
     // change the package name.
     private boolean mShouldOverridePackage;
 
     private boolean mRecordedStartupUma;
     private boolean mShouldReplaceCurrentEntry;
+    private boolean mIsAllowedToOpenInBrowser;
     private CustomTabObserver mTabObserver;
 
     // Only the normal tab model is observed because there is no icognito tabmodel in Custom Tabs.
     private TabModelObserver mTabModelObserver = new EmptyTabModelObserver() {
         @Override
         public void didAddTab(Tab tab, TabLaunchType type) {
             if (mTabObserver == null) {
                 mTabObserver = new CustomTabObserver(getApplication(), mSession);
             }
             tab.addObserver(mTabObserver);
@@ skipping 73 matching lines @@
         super.onStop();
         CustomTabsConnection.getInstance(getApplication())
                 .dontKeepAliveForSession(mIntentDataProvider.getSession());
     }
 
     @Override
     public void preInflationStartup() {
         super.preInflationStartup();
 
         mIntentDataProvider = new CustomTabIntentDataProvider(getIntent(), this);
+        mIsAllowedToOpenInBrowser = !TextUtils.isEmpty(ChromePreferenceManager.getHerbFlavor())

[Ian Wen, 2016/02/10 22:08:40]

mIsAllowedToOpenInBrowser() should still be initialized in
CustomTabIntentDataProvider. You can create a method like
isAllowedToOpenInBrowser().

[gone, 2016/02/10 22:28:24]

Done.

+                && IntentUtils.safeGetBooleanExtra(
+                        getIntent(), EXTRA_ALLOW_OPEN_IN_BROWSER, false);
+
         supportRequestWindowFeature(Window.FEATURE_ACTION_MODE_OVERLAY);
     }
 
     @Override
     public void postInflationStartup() {
         super.postInflationStartup();
         setTabModelSelector(new TabModelSelectorImpl(this, 0, getWindowAndroid(), false));
         getToolbarManager().setCloseButtonDrawable(mIntentDataProvider.getCloseButtonDrawable());
         getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()
                 == CustomTabsIntent.SHOW_PAGE_TITLE);
@@ skipping 250 matching lines @@
                 finish();
             }
         }
         return true;
     }
 
     /**
      * Configures the custom button on toolbar. Does nothing if invalid data is provided by clients.
      */
     private void showCustomButtonOnToolbar() {
-        CustomButtonParams params = mIntentDataProvider.getCustomButtonOnToolbar();
+        final CustomButtonParams params = mIntentDataProvider.getCustomButtonOnToolbar();
         if (params == null) return;
         getToolbarManager().setCustomActionButton(
                 params.getIcon(getResources()),
                 params.getDescription(),
                 new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        mIntentDataProvider.sendButtonPendingIntentWithUrl(
-                                getApplicationContext(), getActivityTab().getUrl());
-                        RecordUserAction.record("CustomTabsCustomActionButtonClick");
+                        if (mIsAllowedToOpenInBrowser && TextUtils.equals(getPackageName(),
+                                ApiCompatibilityUtils.getCreatorPackage(
+                                        params.getPendingIntent()))) {
+                            openCurrentUrlInBrowser();
+                            finish();
+                        } else {
+                            mIntentDataProvider.sendButtonPendingIntentWithUrl(
+                                    getApplicationContext(), getActivityTab().getUrl());
+                            RecordUserAction.record("CustomTabsCustomActionButtonClick");
+                        }
                     }
                 });
     }
 
     /**
      * Updates the button on the bottom bar that corresponds to the given {@link CustomButtonParams}
      */
     private void updateBottomBarButton(CustomButtonParams params) {
         ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
         ImageButton button = (ImageButton) bottomBar.findViewById(params.getId());
@@ skipping 86 matching lines @@
 
     @Override
     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
         // 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.bookmark_this_page_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.open_in_browser_id) {
-            String url = getTabModelSelector().getCurrentTab().getUrl();
-            if (DomDistillerUrlUtils.isDistilledPage(url)) {
-                url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
-            }
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            // Temporarily allowing disk access while fixing. TODO: http://crbug.com/581860
-            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
-            StrictMode.allowThreadDiskWrites();
-            try {
-                startActivity(intent);
-            } finally {
-                StrictMode.setThreadPolicy(oldPolicy);
-            }
-
+            openCurrentUrlInBrowser();
             RecordUserAction.record("CustomTabsMenuOpenInChrome");
             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 {
@@ skipping 24 matching lines @@
     }
 
     /**
      * @return The {@link CustomTabIntentDataProvider} for this {@link CustomTabActivity}. For test
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
+
+    /**
+     * Opens the URL currently being displayed in the Custom Tab in the regular browser.
+     */
+    void openCurrentUrlInBrowser() {
+        String url = getTabModelSelector().getCurrentTab().getUrl();
+        if (DomDistillerUrlUtils.isDistilledPage(url)) {
+            url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
+        }
+        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);
+
+        // Temporarily allowing disk access while fixing. TODO: http://crbug.com/581860
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+        StrictMode.allowThreadDiskWrites();
+        try {
+            startActivity(intent);
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
+        }
+    }
 }