| Index: chrome/android/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
|
| index e35128cf3cd436e0990a3395e68b1dc44f83d9ea..b007279bbb935be5f4926c028274e2af2e513570 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/EmptyTabObserver.java
|
| @@ -82,29 +82,18 @@ public class EmptyTabObserver implements TabObserver {
|
| public void onToggleFullscreenMode(Tab tab, boolean enable) { }
|
|
|
| @Override
|
| - public void onDidFailLoad(Tab tab, boolean isProvisionalLoad, boolean isMainFrame,
|
| - int errorCode, String description, String failingUrl) { }
|
| -
|
| - @Override
|
| - public void onDidStartProvisionalLoadForFrame(
|
| - Tab tab, boolean isMainFrame, String validatedUrl) {}
|
| -
|
| - @Override
|
| - public void onDidCommitProvisionalLoadForFrame(Tab tab, long frameId, boolean isMainFrame,
|
| - String url, int transitionType) { }
|
| -
|
| - @Override
|
| - public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
|
| - boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode) { }
|
| + public void onDidFailLoad(
|
| + Tab tab, boolean isMainFrame, int errorCode, String description, String failingUrl) {}
|
|
|
| @Override
|
| public void onDidStartNavigation(
|
| - Tab tab, String url, boolean isInMainFrame, boolean isErrorPage) {}
|
| + Tab tab, String url, boolean isInMainFrame, boolean isSamePage, boolean isErrorPage) {}
|
|
|
| @Override
|
| public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
|
| - boolean isErrorPage, boolean hasCommitted, boolean isSamePage, Integer pageTransition,
|
| - int errorCode) {}
|
| + boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
|
| + boolean isFragmentNavigation, Integer pageTransition, int errorCode,
|
| + int httpStatusCode) {}
|
|
|
| @Override
|
| public void didFirstVisuallyNonEmptyPaint(Tab tab) {}
|
| @@ -119,9 +108,6 @@ public class EmptyTabObserver implements TabObserver {
|
| public void onDidDetachInterstitialPage(Tab tab) { }
|
|
|
| @Override
|
| - public void onDidStartNavigationToPendingEntry(Tab tab, String url) { }
|
| -
|
| - @Override
|
| public void onBackgroundColorChanged(Tab tab, int color) { }
|
|
|
| @Override
|
|
|