| 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 9e83fc563b9639b817ec18ebd4209a0a748aa348..cf3d6e9b15986e36edd80e60ff6e077467cb3bd1 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
|
| @@ -137,19 +137,14 @@ import org.chromium.content_public.browser.NavigationHistory;
|
| @Override
|
| public void loadUrl(LoadUrlParams params) {
|
| if (mNativeNavigationControllerAndroid != 0) {
|
| - nativeLoadUrl(
|
| - mNativeNavigationControllerAndroid,
|
| - params.getUrl(),
|
| + nativeLoadUrl(mNativeNavigationControllerAndroid, params.getUrl(),
|
| params.getLoadUrlType(), params.getTransitionType(),
|
| params.getReferrer() != null ? params.getReferrer().getUrl() : null,
|
| params.getReferrer() != null ? params.getReferrer().getPolicy() : 0,
|
| - params.getUserAgentOverrideOption(),
|
| - params.getExtraHeadersString(),
|
| - params.getPostData(),
|
| - params.getBaseUrl(),
|
| - params.getVirtualUrlForDataUrl(),
|
| - params.getCanLoadLocalResources(),
|
| - params.getIsRendererInitiated());
|
| + params.getUserAgentOverrideOption(), params.getExtraHeadersString(),
|
| + params.getPostData(), params.getBaseUrl(), params.getVirtualUrlForDataUrl(),
|
| + params.getCanLoadLocalResources(), params.getIsRendererInitiated(),
|
| + params.getShouldReplaceCurrentEntry());
|
| }
|
| }
|
|
|
| @@ -303,20 +298,11 @@ import org.chromium.content_public.browser.NavigationHistory;
|
| boolean checkForRepost);
|
| private native void nativeReloadIgnoringCache(long nativeNavigationControllerAndroid,
|
| boolean checkForRepost);
|
| - private native void nativeLoadUrl(
|
| - long nativeNavigationControllerAndroid,
|
| - String url,
|
| - int loadUrlType,
|
| - int transitionType,
|
| - String referrerUrl,
|
| - int referrerPolicy,
|
| - int uaOverrideOption,
|
| - String extraHeaders,
|
| - byte[] postData,
|
| - String baseUrlForDataUrl,
|
| - String virtualUrlForDataUrl,
|
| - boolean canLoadLocalResources,
|
| - boolean isRendererInitiated);
|
| + private native void nativeLoadUrl(long nativeNavigationControllerAndroid, String url,
|
| + int loadUrlType, int transitionType, String referrerUrl, int referrerPolicy,
|
| + int uaOverrideOption, String extraHeaders, byte[] postData, String baseUrlForDataUrl,
|
| + String virtualUrlForDataUrl, boolean canLoadLocalResources, boolean isRendererInitiated,
|
| + boolean shouldReplaceCurrentEntry);
|
| private native void nativeClearHistory(long nativeNavigationControllerAndroid);
|
| private native int nativeGetNavigationHistory(long nativeNavigationControllerAndroid,
|
| Object history);
|
|
|