| Index: content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
|
| index 56f2f39f97cdb837067b9107485bd6c23f4ffc2a..28759ed0d30ebf3d0615f030eb973c17bacbc19d 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
|
| @@ -180,14 +180,6 @@ import org.chromium.content_public.browser.NavigationHistory;
|
| return nativeGetOriginalUrlForVisibleNavigationEntry(mNativeNavigationControllerAndroid);
|
| }
|
|
|
| - @CalledByNative
|
| - private void addToNavigationHistory(Object history, int index, String url,
|
| - String virtualUrl,String originalUrl, String title, Bitmap favicon) {
|
| - NavigationEntry entry = new NavigationEntry(index, url, virtualUrl,
|
| - originalUrl, title, favicon);
|
| - ((NavigationHistory) history).addEntry(entry);
|
| - }
|
| -
|
| @Override
|
| public void clearSslPreferences() {
|
| if (mNativeNavigationControllerAndroid != 0) {
|
| @@ -209,6 +201,26 @@ import org.chromium.content_public.browser.NavigationHistory;
|
| }
|
| }
|
|
|
| + @Override
|
| + public NavigationEntry getPendingEntry() {
|
| + if (mNativeNavigationControllerAndroid != 0) {
|
| + return nativeGetPendingEntry(mNativeNavigationControllerAndroid);
|
| + }
|
| +
|
| + return null;
|
| + }
|
| +
|
| + @CalledByNative
|
| + private static void addToNavigationHistory(Object history, Object navigationEntry) {
|
| + ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry);
|
| + }
|
| +
|
| + @CalledByNative
|
| + private static NavigationEntry createNavigationEntry(int index, String url,
|
| + String virtualUrl, String originalUrl, String title, Bitmap favicon) {
|
| + return new NavigationEntry(index, url, virtualUrl, originalUrl, title, favicon);
|
| + }
|
| +
|
| private native boolean nativeCanGoBack(long nativeNavigationControllerAndroid);
|
| private native boolean nativeCanGoForward(long nativeNavigationControllerAndroid);
|
| private native void nativeLoadIfNecessary(long nativeNavigationControllerAndroid);
|
| @@ -251,4 +263,5 @@ import org.chromium.content_public.browser.NavigationHistory;
|
| private native boolean nativeGetUseDesktopUserAgent(long nativeNavigationControllerAndroid);
|
| private native void nativeSetUseDesktopUserAgent(long nativeNavigationControllerAndroid,
|
| boolean override, boolean reloadOnChange);
|
| + private native NavigationEntry nativeGetPendingEntry(long nativeNavigationControllerAndroid);
|
| }
|
|
|