PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.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.webapps;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ skipping 363 matching lines @@
 
     protected TabObserver createTabObserver() {
         return new EmptyTabObserver() {
 
             @Override
             public void onSSLStateUpdated(Tab tab) {
                 updateUrlBar();
             }
 
             @Override
-            public void onDidStartProvisionalLoadForFrame(
-                    Tab tab, boolean isMainFrame, String validatedUrl) {
-                if (isMainFrame) updateUrlBar();
+            public void onDidStartNavigation(
+                    Tab tab, String url, boolean isInMainFrame, boolean isErrorPage) {
+                if (isInMainFrame) updateUrlBar();

[jam, 2017/02/07 05:10:32]

same comment ToolbarManager.java, I think yo ualso want to check !isSamePage to
maintain same behavior as before

[shaktisahu, 2017/02/08 01:00:46]

Done.

             }
 
             @Override
+            public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
+                    boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
+                    boolean isFragmentNavigation, Integer pageTransition, int errorCode,
+                    int httpStatusCode) {
+                if (hasCommitted && isInMainFrame) updateUrlBar();
+            }
+
+            @Override
             public void onDidChangeThemeColor(Tab tab, int color) {
                 if (!isWebappDomain()) return;
                 mBrandColor = color;
                 updateTaskDescription();
             }
 
             @Override
             public void onTitleUpdated(Tab tab) {
                 if (!isWebappDomain()) return;
                 updateTaskDescription();
             }
 
             @Override
             public void onFaviconUpdated(Tab tab, Bitmap icon) {
                 if (!isWebappDomain()) return;
                 // No need to cache the favicon if there is an icon declared in app manifest.
                 if (mWebappInfo.icon() != null) return;
                 if (icon == null) return;
                 if (mLargestFavicon == null || icon.getWidth() > mLargestFavicon.getWidth()
                         || icon.getHeight() > mLargestFavicon.getHeight()) {
                     mLargestFavicon = icon;
                     updateTaskDescription();
                 }
             }
 
             @Override
-            public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
-                    boolean isNavigationToDifferentPage, boolean isNavigationInPage,
-                    int statusCode) {
-                updateUrlBar();
-            }
-
-            @Override
             public void onDidAttachInterstitialPage(Tab tab) {
                 updateUrlBar();
 
                 int state = ApplicationStatus.getStateForActivity(WebappActivity.this);
                 if (state == ActivityState.PAUSED || state == ActivityState.STOPPED
                         || state == ActivityState.DESTROYED) {
                     return;
                 }
 
                 // Kick the interstitial navigation to Chrome.
@@ skipping 150 matching lines @@
         return new WebappDelegateFactory(this);
     }
 
     // We're temporarily disable CS on webapp since there are some issues. (http://crbug.com/471950)
     // TODO(changwan): re-enable it once the issues are resolved.
     @Override
     protected boolean isContextualSearchAllowed() {
         return false;
     }
 }