| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
| index f13b2897fcf7d36a2d6d0c40830118212f33780d..0ccf7b33794ff40abf308986b2de23a36921977b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
|
| @@ -299,22 +299,25 @@ public class OverlayPanelContent {
|
| }
|
|
|
| @Override
|
| - public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId,
|
| - boolean isMainFrame, String validatedUrl, boolean isErrorPage) {
|
| - if (isMainFrame) {
|
| - mContentDelegate.onMainFrameLoadStarted(validatedUrl,
|
| - !TextUtils.equals(validatedUrl, mLoadedUrl));
|
| + public void didStartNavigation(
|
| + String url, boolean isInMainFrame, boolean isErrorPage) {
|
| + if (isInMainFrame) {
|
| + mContentDelegate.onMainFrameLoadStarted(
|
| + url, !TextUtils.equals(url, mLoadedUrl));
|
| }
|
| }
|
|
|
| @Override
|
| - public void didNavigateMainFrame(String url, String baseUrl,
|
| - boolean isNavigationToDifferentPage, boolean isNavigationInPage,
|
| - int httpResultCode) {
|
| - mIsProcessingPendingNavigation = false;
|
| - mContentDelegate.onMainFrameNavigation(url,
|
| - !TextUtils.equals(url, mLoadedUrl),
|
| - isHttpFailureCode(httpResultCode));
|
| + public void didFinishNavigation(String url, boolean isInMainFrame,
|
| + boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
|
| + boolean isFragmentNavigation, Integer pageTransition, int errorCode,
|
| + int httpStatusCode) {
|
| + if (hasCommitted && isInMainFrame) {
|
| + mIsProcessingPendingNavigation = false;
|
| + mContentDelegate.onMainFrameNavigation(url,
|
| + !TextUtils.equals(url, mLoadedUrl),
|
| + isHttpFailureCode(httpStatusCode));
|
| + }
|
| }
|
|
|
| @Override
|
|
|