Remove CustomTab and have all CustomTabActivity using Tab

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.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.IBinder;
@@ skipping 11 matching lines @@
 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.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.appmenu.ChromeAppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
 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.SingleTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 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.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;
 
 /**
  * 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 = "cr.CustomTabActivity";
     private static CustomTabContentHandler sActiveContentHandler;
 
-    private CustomTab mTab;
+    private Tab mTab;
     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 CustomTabObserver mTabObserver;
 
     /**
      * Sets the currently active {@link CustomTabContentHandler} in focus.
      * @param contentHandler {@link CustomTabContentHandler} to set.
      */
     public static void setActiveContentHandler(CustomTabContentHandler contentHandler) {
         sActiveContentHandler = contentHandler;
     }
 
     /**
@@ skipping 88 matching lines @@
         }
 
         // Setting task title and icon to be null will preserve the client app's title and icon.
         ApiCompatibilityUtils.setTaskDescription(this, null, null, toolbarColor);
         showActionButton();
     }
 
     @Override
     public void finishNativeInitialization() {
         mSession = mIntentDataProvider.getSession();
-        String url = IntentHandler.getUrlFromIntent(getIntent());
-        // Get any referrer that has been explicitly set by the app.
-        String referrerUrl = IntentHandler.getReferrerUrlIncludingExtraHeaders(getIntent(), this);
-        if (referrerUrl == null) {
-            Referrer referrer = CustomTabsConnection.getInstance(getApplication())
-                    .getReferrerForSession(mSession);
-            if (referrer != null) referrerUrl = referrer.getUrl();
-        }
         // If extra headers have been passed, cancel any current prerender, as
         // prerendering doesn't support extra headers.
         if (IntentHandler.getExtraHeadersFromIntent(getIntent()) != null) {
             CustomTabsConnection.getInstance(getApplication()).cancelPrerender(mSession);
         }
-
-        mTab = new CustomTab(this, getWindowAndroid(), mSession, url, referrerUrl,
-                Tab.INVALID_TAB_ID, mIntentDataProvider.shouldEnableUrlBarHiding());
+        createTab();
         getTabModelSelector().setTab(mTab);
 
         ToolbarControlContainer controlContainer = (ToolbarControlContainer) findViewById(
                 R.id.control_container);
         LayoutManagerDocument layoutDriver = new LayoutManagerDocument(getCompositorViewHolder());
         initializeCompositorContent(layoutDriver, findViewById(R.id.url_bar),
                 (ViewGroup) findViewById(android.R.id.content), controlContainer);
         mFindToolbarManager = new FindToolbarManager(this, getTabModelSelector(),
                 getToolbarManager().getActionModeController().getActionModeCallback());
         if (getContextualSearchManager() != null) {
@@ skipping 24 matching lines @@
             public boolean shouldIgnoreIntent(Intent intent) {
                 return mIntentHandler.shouldIgnoreIntent(CustomTabActivity.this, intent);
             }
 
             @Override
             public boolean updateActionButton(Bitmap bitmap, String description) {
                 mIntentDataProvider.getActionButtonParams().update(bitmap, description);
                 return showActionButton();
             }
         };
-        loadUrlInCurrentTab(new LoadUrlParams(url),
+        loadUrlInCurrentTab(new LoadUrlParams(IntentHandler.getUrlFromIntent(getIntent())),
                 IntentHandler.getTimestampFromIntent(getIntent()));
         recordClientPackageName();
         super.finishNativeInitialization();
     }
 
+    private void createTab() {
+        String url = IntentHandler.getUrlFromIntent(getIntent());
+        // Get any referrer that has been explicitly set by the app.
+        String referrerUrl = IntentHandler.getReferrerUrlIncludingExtraHeaders(getIntent(), this);
+        if (referrerUrl == null) {
+            Referrer referrer = CustomTabsConnection.getInstance(getApplication())
+                    .getReferrerForSession(mSession);
+            if (referrer != null) referrerUrl = referrer.getUrl();
+        }
+        mTab = new Tab(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID),
+                Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
+                TabLaunchType.FROM_EXTERNAL_APP, null, null) {
+            @Override
+            protected boolean isHidingTopControlsEnabled() {
+                // TODO(yusufo) : Get rid of this call once all other Tab classes are removed.
+                return mIntentDataProvider.shouldEnableUrlBarHiding()
+                        && super.isHidingTopControlsEnabled();
+            }
+        };
+        CustomTabsConnection customTabsConnection =
+                CustomTabsConnection.getInstance(getApplication());
+        WebContents webContents =
+                customTabsConnection.takePrerenderedUrl(mSession, url, referrerUrl);
+        if (webContents == null) {
+            webContents = customTabsConnection.takeSpareWebContents();
+            // TODO(lizeb): Remove this once crbug.com/521729 is fixed.
+            if (webContents != null) mShouldReplaceCurrentEntry = true;
+        }
+        if (webContents == null) {
+            webContents = WebContentsFactory.createWebContents(false, false);
+        }
+        mTab.initialize(webContents, getTabContentManager(),
+                new CustomTabDelegateFactory(getApplication(), mSession), false);
+        mTab.getView().requestFocus();
+        mTabObserver = new CustomTabObserver(getApplication(), mSession);
+        mTab.addObserver(mTabObserver);
+    }
+
     private void recordClientPackageName() {
         final String packageName = CustomTabsConnection.getInstance(getApplication())
                 .getClientPackageNameForSession(mSession);
         if (TextUtils.isEmpty(packageName) || packageName.contains(getPackageName())) return;
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 RapporServiceBridge.sampleString(
                         "CustomTabs.ServiceClient.PackageName", packageName);
             }
@@ skipping 20 matching lines @@
         CustomTabsConnection.getInstance(getApplication()).notifyNavigationEvent(
                 mSession, CustomTabsCallback.TAB_HIDDEN);
     }
 
     @Override
     public void onStopWithNative() {
         super.onStopWithNative();
         setActiveContentHandler(null);
     }
 
+    /* (non-Javadoc)
+     * @see org.chromium.chrome.browser.ChromeActivity#onDestroyInternal()
+     */
+    @Override
+    protected void onDestroyInternal() {
+        mTab.removeObserver(mTabObserver);
+        super.onDestroyInternal();
+    }
+
     /**
-     * Loads the current tab with the given load params. Unlike
-     * {@link CustomTab#loadUrlAndTrackFromTimestamp(LoadUrlParams, long)}, this method takes client
+     * Loads the current tab with the given load params while taking client
      * referrer and extra headers into account.
      */
-    private void loadUrlInCurrentTab(LoadUrlParams params, long timeStamp) {
+    void loadUrlInCurrentTab(LoadUrlParams params, long timeStamp) {
         Intent intent = getIntent();
         IntentHandler.addReferrerAndHeaders(params, intent, this);
         if (params.getReferrer() == null) {
             params.setReferrer(CustomTabsConnection.getInstance(getApplication())
                     .getReferrerForSession(mSession));
         }
-        mTab.loadUrlAndTrackFromTimestamp(params, timeStamp);
+        mTabObserver.trackNextPageLoadFromTimestamp(timeStamp);
+        if (mShouldReplaceCurrentEntry) params.setShouldReplaceCurrentEntry(true);
+        mShouldReplaceCurrentEntry = false;
+        mTab.loadUrl(params);
     }
 
     @Override
     public void createContextualSearchTab(String searchUrl) {
         if (mTab == null) return;
         mTab.loadUrl(new LoadUrlParams(searchUrl));
     }
 
     @Override
     public SingleTabModelSelector getTabModelSelector() {
@@ skipping 162 matching lines @@
 
     /**
      * @return The {@link CustomTabIntentDataProvider} for this {@link CustomTabActivity}. For test
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
 }