Better distinguish didFinishLoad and didStopLoading

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

 // Copyright 2014 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.tab;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ skipping 1376 matching lines @@
             observer.onOverlayContentViewCoreRemoved(this, content);
         }
 
         assert mOverlayContentViewCores.contains(content);
         mOverlayContentViewCores.remove(content);
 
         nativeDetachOverlayContentViewCore(mNativeTabAndroid, content);
     }
 
     /**
+     * Called when a navigation begins and no navigation was in progress
+     * @param toDifferentDocument Whether this navigation will transition between
+     * documents (i.e., not a fragment navigation or JS History API call).
+     */
+    protected void onLoadStarted(boolean toDifferentDocument) {
+        mIsLoading = true;

[Ted C, 2015/10/28 23:41:02]

To keep the logic the same as before, I think you want to guard mIsLoading with
toDifferentDocument (and the same in onLoadStopped).

[Nate Chapin, 2015/10/30 20:41:34]

Guarded here. I don't think onLoadStopped needs the guard though, since if this
is a same-document navigation, mIsLoading should be guaranteed false when
onLoadStopped is called. Moved mIsLoading = false in onLoadStopped to after the
observer calls, so that ToolbarManager can see the difference between same and
different document navigations.

+        for (TabObserver observer : mObservers) observer.onLoadStarted(this, toDifferentDocument);
+    }
+
+    /**
+     * Called when a navigation completes and no other navigation is in progress.
+     */
+    protected void onLoadStopped() {
+        mIsLoading = false;
+        for (TabObserver observer : mObservers) observer.onLoadStopped(this);
+    }
+
+    /**
      * Called when a page has started loading.
      * @param validatedUrl URL being loaded.
      * @param showingErrorPage Whether an error page is being shown.
      */
     protected void didStartPageLoad(String validatedUrl, boolean showingErrorPage) {
         mIsFullscreenWaitingForLoad = !DomDistillerUrlUtils.isDistilledPage(validatedUrl);
 
         mIsShowingErrorPage = showingErrorPage;
-        mIsLoading = true;
 
         updateTitle();
         removeSadTabIfPresent();
 
         clearHungRendererState();
 
         for (TabObserver observer : mObservers) observer.onPageLoadStarted(this, validatedUrl);
     }
 
     /**
      * Called when a page has finished loading.
      */
     protected void didFinishPageLoad() {
-        mIsLoading = false;
         mIsBeingRestored = false;
         mIsTabStateDirty = true;
         updateTitle();
         updateFullscreenEnabledState();
         if (!isNativePage()) {
             RecordHistogram.recordBooleanHistogram(
                     "Navigation.IsMobileOptimized", mContentViewCore.getIsMobileOptimizedHint());
         }
 
         if (mTabUma != null) mTabUma.onLoadFinished();
@@ skipping 12 matching lines @@
                     MSG_ID_ENABLE_FULLSCREEN_AFTER_LOAD, MAX_FULLSCREEN_LOAD_DELAY_MS);
         }
     }
 
     /**
      * Called when a page has failed loading.
      * @param errorCode The error code causing the page to fail loading.
      */
     protected void didFailPageLoad(int errorCode) {
         cancelEnableFullscreenLoadDelay();
-        mIsLoading = false;
         mIsBeingRestored = false;
         if (mTabUma != null) mTabUma.onLoadFailed(errorCode);
         for (TabObserver observer : mObservers) observer.onPageLoadFailed(this, errorCode);
         updateFullscreenEnabledState();
     }
 
     private void cancelEnableFullscreenLoadDelay() {
         mHandler.removeMessages(MSG_ID_ENABLE_FULLSCREEN_AFTER_LOAD);
         mIsFullscreenWaitingForLoad = false;
     }
@@ skipping 1398 matching lines @@
     private native void nativeSetInterceptNavigationDelegate(long nativeTabAndroid,
             InterceptNavigationDelegate delegate);
     private native void nativeAttachToTabContentManager(long nativeTabAndroid,
             TabContentManager tabContentManager);
     private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content, boolean visible);
     private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
 }