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..32e1f8aec49b557a2283ee8b429cdfbeca935e3e 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 |
@@ -24,6 +24,7 @@ import org.chromium.content.browser.ContentVideoViewEmbedder; |
import org.chromium.content.browser.ContentView; |
import org.chromium.content.browser.ContentViewCore; |
import org.chromium.content_public.browser.LoadUrlParams; |
+import org.chromium.content_public.browser.NavigationHandle; |
import org.chromium.content_public.browser.WebContents; |
import org.chromium.content_public.browser.WebContentsObserver; |
import org.chromium.ui.base.ViewAndroidDelegate; |
@@ -299,22 +300,19 @@ 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(NavigationHandle navigation) { |
+ if (navigation.isInMainFrame()) { |
+ mContentDelegate.onMainFrameLoadStarted(navigation.getValidatedURL(), |
+ !TextUtils.equals(navigation.getValidatedURL(), mLoadedUrl)); |
} |
} |
@Override |
- public void didNavigateMainFrame(String url, String baseUrl, |
- boolean isNavigationToDifferentPage, boolean isNavigationInPage, |
- int httpResultCode) { |
+ public void didFinishNavigation(NavigationHandle navigation) { |
mIsProcessingPendingNavigation = false; |
- mContentDelegate.onMainFrameNavigation(url, |
- !TextUtils.equals(url, mLoadedUrl), |
- isHttpFailureCode(httpResultCode)); |
+ mContentDelegate.onMainFrameNavigation(navigation.getValidatedURL(), |
+ !TextUtils.equals(navigation.getValidatedURL(), mLoadedUrl), |
+ navigation.isErrorPage()); |
} |
@Override |