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..5dc87d59f4a76f5c4a4850202cae7e2116624cbc 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 |
@@ -181,11 +181,14 @@ import org.chromium.content_public.browser.NavigationHistory; |
} |
@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); |
+ private void addToNavigationHistory(Object history, Object navigationEntry) { |
Ted C
2014/09/18 20:29:06
you can has make these static plz?
David Trainor- moved to gerrit
2014/09/18 21:06:24
Done.
|
+ ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry); |
+ } |
+ |
+ @CalledByNative |
+ private NavigationEntry createNavigationEntry(int index, String url, |
+ String virtualUrl, String originalUrl, String title, Bitmap favicon) { |
+ return new NavigationEntry(index, url, virtualUrl, originalUrl, title, favicon); |
} |
@Override |
@@ -209,6 +212,15 @@ import org.chromium.content_public.browser.NavigationHistory; |
} |
} |
+ @Override |
+ public NavigationEntry getPendingEntry() { |
+ if (mNativeNavigationControllerAndroid != 0) { |
+ return nativeGetPendingEntry(mNativeNavigationControllerAndroid); |
+ } |
+ |
+ return null; |
+ } |
+ |
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); |
} |