Better distinguish didFinishLoad and didStopLoading

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index 88b8013aeacbcbcd48cef7f7eb1ac2543a7b3c39..542e163121b357b5216e6035a263c4274a39e34f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -1394,6 +1394,24 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
+     * 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.
@@ -1402,7 +1420,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         mIsFullscreenWaitingForLoad = !DomDistillerUrlUtils.isDistilledPage(validatedUrl);
 
         mIsShowingErrorPage = showingErrorPage;
-        mIsLoading = true;
 
         updateTitle();
         removeSadTabIfPresent();
@@ -1416,7 +1433,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
      * Called when a page has finished loading.
      */
     protected void didFinishPageLoad() {
-        mIsLoading = false;
         mIsBeingRestored = false;
         mIsTabStateDirty = true;
         updateTitle();
@@ -1449,7 +1465,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
      */
     protected void didFailPageLoad(int errorCode) {
         cancelEnableFullscreenLoadDelay();
-        mIsLoading = false;
         mIsBeingRestored = false;
         if (mTabUma != null) mTabUma.onLoadFailed(errorCode);
         for (TabObserver observer : mObservers) observer.onPageLoadFailed(this, errorCode);