Add signals to make callback more reliable

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTab.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.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.os.IBinder;
@@ skipping 10 matching lines @@
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.UrlUtilities;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuParams;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
+import org.chromium.chrome.browser.ssl.ConnectionSecurityLevel;
 import org.chromium.chrome.browser.tab.ChromeTab;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.util.concurrent.TimeUnit;
@@ skipping 30 matching lines @@
         @Override
         public void onLoadUrl(Tab tab, LoadUrlParams params, int loadType) {
             mCustomTabsConnection.registerLaunch(mSession, params.getUrl());
         }
 
         @Override
         public void onPageLoadStarted(Tab tab, String url) {
             if (mCurrentState == STATE_WAITING_LOAD_START) {
                 mPageLoadStartedTimestamp = SystemClock.elapsedRealtime();
                 mCurrentState = STATE_WAITING_LOAD_FINISH;
+            } else if (mCurrentState == STATE_WAITING_LOAD_FINISH) {
+                mCustomTabsConnection.notifyNavigationEvent(
+                        mSession, CustomTabsCallback.NAVIGATION_ABORTED);
+                mPageLoadStartedTimestamp = SystemClock.elapsedRealtime();
             }
             mCustomTabsConnection.notifyNavigationEvent(
                     mSession, CustomTabsCallback.NAVIGATION_STARTED);
         }
 
         @Override
+        public void onShown(Tab tab) {
+            mCustomTabsConnection.notifyNavigationEvent(
+                    mSession, CustomTabsCallback.TAB_SHOWN);
+        }
+
+        @Override
+        public void onHidden(Tab tab) {
+            mCustomTabsConnection.notifyNavigationEvent(
+                    mSession, CustomTabsCallback.TAB_HIDDEN);
+        }
+
+        @Override
         public void onPageLoadFinished(Tab tab) {
             long pageLoadFinishedTimestamp = SystemClock.elapsedRealtime();
             mCustomTabsConnection.notifyNavigationEvent(
                     mSession, CustomTabsCallback.NAVIGATION_FINISHED);
             // Both histograms (commit and PLT) are reported here, to make sure
             // that they are always recorded together, and that we only record
             // commits for successful navigations.
             if (mCurrentState == STATE_WAITING_LOAD_FINISH && mIntentReceivedTimestamp > 0) {
                 long timeToPageLoadStartedMs = mPageLoadStartedTimestamp - mIntentReceivedTimestamp;
                 long timeToPageLoadFinishedMs =
                         pageLoadFinishedTimestamp - mIntentReceivedTimestamp;
                 // Same bounds and bucket count as "Startup.FirstCommitNavigationTime"
                 RecordHistogram.recordCustomTimesHistogram(
                         "CustomTabs.IntentToFirstCommitNavigationTime", timeToPageLoadStartedMs,
                         1, TimeUnit.MINUTES.toMillis(1), TimeUnit.MILLISECONDS, 225);
                 // Same bounds and bucket count as PLT histograms.
                 RecordHistogram.recordCustomTimesHistogram("CustomTabs.IntentToPageLoadedTime",
                         timeToPageLoadFinishedMs, 10, TimeUnit.MINUTES.toMillis(10),
                         TimeUnit.MILLISECONDS, 100);
             }
             resetPageLoadTracking();
         }
 
         @Override
+        public void onDidAttachInterstitialPage(Tab tab) {
+            if (tab.getSecurityLevel() != ConnectionSecurityLevel.SECURITY_ERROR) return;
+            resetPageLoadTracking();
+            mCustomTabsConnection.notifyNavigationEvent(
+                    mSession, CustomTabsCallback.NAVIGATION_FAILED);
+        }
+
+        @Override
         public void onPageLoadFailed(Tab tab, int errorCode) {
             resetPageLoadTracking();
+            mCustomTabsConnection.notifyNavigationEvent(
+                    mSession, CustomTabsCallback.NAVIGATION_FAILED);
         }
 
         private void resetPageLoadTracking() {
             mCurrentState = STATE_RESET;
             mIntentReceivedTimestamp = -1;
         }
     }
 
     private ExternalNavigationHandler mNavigationHandler;
     private CustomTabNavigationDelegate mNavigationDelegate;
@@ skipping 176 matching lines @@
             // See http://crbug.com/369574.
             if (e.getCause() != null && e.getCause() instanceof TransactionTooLargeException) {
                 Log.e(TAG, "Could not resolve Activity for intent " + intent.toString(), e);
             } else {
                 throw e;
             }
         }
     }
 
 }