| 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..52e3d51daa99c57d59107a201b60ec6e6e5815c9 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,23 @@ 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) {
|
| + public void didFinishNavigation(String url, boolean isInMainFrame,
|
| + boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
|
| + boolean isReload) {
|
| + if (!isInMainFrame) return;
|
| +
|
| mIsProcessingPendingNavigation = false;
|
| - mContentDelegate.onMainFrameNavigation(url,
|
| - !TextUtils.equals(url, mLoadedUrl),
|
| - isHttpFailureCode(httpResultCode));
|
| + mContentDelegate.onMainFrameNavigation(
|
| + url, !TextUtils.equals(url, mLoadedUrl), isErrorPage);
|
| }
|
|
|
| @Override
|
| @@ -433,13 +434,6 @@ public class OverlayPanelContent {
|
| }
|
|
|
| /**
|
| - * @return Whether the given HTTP result code represents a failure or not.
|
| - */
|
| - private boolean isHttpFailureCode(int httpResultCode) {
|
| - return httpResultCode <= 0 || httpResultCode >= 400;
|
| - }
|
| -
|
| - /**
|
| * @return true if the ContentViewCore is visible on the page.
|
| */
|
| public boolean isContentShowing() {
|
|
|