Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1446)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

Issue 2642303002: PlzNavigate: Chrome UI changes for new methods of WebContentsObserver (Closed)
Patch Set: undo changes for error description Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 46c665da527748b0209233f4c6db3940d18c4517..e60a36d2a49ed3cd161e435b05a192799baebc94 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 isSamePage, boolean isErrorPage) {
+ if (isInMainFrame && !isSamePage) {
+ 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,
+ String errorDescription, int httpStatusCode) {
+ if (hasCommitted && isInMainFrame) {
+ mIsProcessingPendingNavigation = false;
+ mContentDelegate.onMainFrameNavigation(url,
+ !TextUtils.equals(url, mLoadedUrl),
+ isHttpFailureCode(httpStatusCode));
+ }
}
};

Powered by Google App Engine
This is Rietveld 408576698