Commit 6ba97d0b authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

AW: remove legacy non-PlzNavigate code for WebView

No change to behavior, this removes no-longer used code paths.

The android_webview/ code only existed to support the old code path.

This removes BrowserSideNavigationPolicy now that
isBrowserSideNavigationEnabled() is guaranteed to return true.

Bug: 822124
Test: N/A
Change-Id: I8d1fb406f572b1fefaac70853140dad64bc5883f
Reviewed-on: https://chromium-review.googlesource.com/963649Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543590}
parent fd3cd0f9
...@@ -85,7 +85,6 @@ import org.chromium.content_public.browser.WebContentsAccessibility; ...@@ -85,7 +85,6 @@ import org.chromium.content_public.browser.WebContentsAccessibility;
import org.chromium.content_public.browser.WebContentsInternals; import org.chromium.content_public.browser.WebContentsInternals;
import org.chromium.content_public.browser.navigation_controller.LoadURLType; import org.chromium.content_public.browser.navigation_controller.LoadURLType;
import org.chromium.content_public.browser.navigation_controller.UserAgentOverrideOption; import org.chromium.content_public.browser.navigation_controller.UserAgentOverrideOption;
import org.chromium.content_public.common.BrowserSideNavigationPolicy;
import org.chromium.content_public.common.ContentUrlConstants; import org.chromium.content_public.common.ContentUrlConstants;
import org.chromium.content_public.common.Referrer; import org.chromium.content_public.common.Referrer;
import org.chromium.content_public.common.UseZoomForDSFPolicy; import org.chromium.content_public.common.UseZoomForDSFPolicy;
...@@ -605,30 +604,11 @@ public class AwContents implements SmartClipProvider { ...@@ -605,30 +604,11 @@ public class AwContents implements SmartClipProvider {
private class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate { private class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate {
@Override @Override
public boolean shouldIgnoreNavigation(NavigationParams navigationParams) { public boolean shouldIgnoreNavigation(NavigationParams navigationParams) {
final String url = navigationParams.url;
boolean ignoreNavigation = false;
// Disable old path for sending shouldoverrideurlloadings for popups when
// plznavigate is enabled. The callback will come through NavigatorRequest.
if (!BrowserSideNavigationPolicy.isBrowserSideNavigationEnabled()
&& mDeferredShouldOverrideUrlLoadingIsPendingForPopup) {
mDeferredShouldOverrideUrlLoadingIsPendingForPopup = false;
// If this is used for all navigations in future, cases for application initiated
// load, redirect and backforward should also be filtered out.
if (!navigationParams.isPost) {
ignoreNavigation = mContentsClient.shouldIgnoreNavigation(
mContext, url, navigationParams.isMainFrame,
navigationParams.hasUserGesture
|| navigationParams.hasUserGestureCarryover,
navigationParams.isRedirect);
}
}
// The shouldOverrideUrlLoading call might have resulted in posting messages to the // The shouldOverrideUrlLoading call might have resulted in posting messages to the
// UI thread. Using sendMessage here (instead of calling onPageStarted directly) // UI thread. Using sendMessage here (instead of calling onPageStarted directly)
// will allow those to run in order. // will allow those to run in order.
if (!ignoreNavigation) { mContentsClient.getCallbackHelper().postOnPageStarted(navigationParams.url);
mContentsClient.getCallbackHelper().postOnPageStarted(url); return false;
}
return ignoreNavigation;
} }
} }
...@@ -1763,13 +1743,6 @@ public class AwContents implements SmartClipProvider { ...@@ -1763,13 +1743,6 @@ public class AwContents implements SmartClipProvider {
mHasRequestedVisitedHistoryFromClient = true; mHasRequestedVisitedHistoryFromClient = true;
requestVisitedHistoryFromClient(); requestVisitedHistoryFromClient();
} }
if (!BrowserSideNavigationPolicy.isBrowserSideNavigationEnabled()
&& params.getLoadUrlType() == LoadURLType.DATA && params.getBaseUrl() != null) {
// Data loads with a base url will be resolved in Blink, and not cause an onPageStarted
// event to be sent. Sending the callback directly from here.
mContentsClient.getCallbackHelper().postOnPageStarted(params.getBaseUrl());
}
} }
/** /**
......
...@@ -37,7 +37,6 @@ source_set("common") { ...@@ -37,7 +37,6 @@ source_set("common") {
sources = [ sources = [
"accessibility_messages.h", "accessibility_messages.h",
"all_messages.h", "all_messages.h",
"android/browser_side_navigation_policy_android.cc",
"android/gin_java_bridge_errors.cc", "android/gin_java_bridge_errors.cc",
"android/gin_java_bridge_errors.h", "android/gin_java_bridge_errors.h",
"android/gin_java_bridge_value.cc", "android/gin_java_bridge_value.cc",
......
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <jni.h>
#include "base/android/scoped_java_ref.h"
#include "content/public/common/browser_side_navigation_policy.h"
#include "jni/BrowserSideNavigationPolicy_jni.h"
using base::android::JavaParamRef;
namespace content {
jboolean JNI_BrowserSideNavigationPolicy_IsBrowserSideNavigationEnabled(
JNIEnv* env,
const JavaParamRef<jclass>& clazz) {
return IsBrowserSideNavigationEnabled();
}
} // namespace content
...@@ -260,7 +260,6 @@ android_library("content_java") { ...@@ -260,7 +260,6 @@ android_library("content_java") {
"java/src/org/chromium/content_public/browser/WebContentsInternals.java", "java/src/org/chromium/content_public/browser/WebContentsInternals.java",
"java/src/org/chromium/content_public/browser/WebContentsObserver.java", "java/src/org/chromium/content_public/browser/WebContentsObserver.java",
"java/src/org/chromium/content_public/browser/WebContentsStatics.java", "java/src/org/chromium/content_public/browser/WebContentsStatics.java",
"java/src/org/chromium/content_public/common/BrowserSideNavigationPolicy.java",
"java/src/org/chromium/content_public/common/ContentProcessInfo.java", "java/src/org/chromium/content_public/common/ContentProcessInfo.java",
"java/src/org/chromium/content_public/common/ContentUrlConstants.java", "java/src/org/chromium/content_public/common/ContentUrlConstants.java",
"java/src/org/chromium/content_public/common/MediaMetadata.java", "java/src/org/chromium/content_public/common/MediaMetadata.java",
...@@ -391,7 +390,6 @@ generate_jni("content_jni_headers") { ...@@ -391,7 +390,6 @@ generate_jni("content_jni_headers") {
"java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java", "java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
"java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java", "java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
"java/src/org/chromium/content_public/browser/LoadUrlParams.java", "java/src/org/chromium/content_public/browser/LoadUrlParams.java",
"java/src/org/chromium/content_public/common/BrowserSideNavigationPolicy.java",
"java/src/org/chromium/content_public/common/MediaMetadata.java", "java/src/org/chromium/content_public/common/MediaMetadata.java",
"java/src/org/chromium/content_public/common/ResourceRequestBody.java", "java/src/org/chromium/content_public/common/ResourceRequestBody.java",
"java/src/org/chromium/content_public/common/UseZoomForDSFPolicy.java", "java/src/org/chromium/content_public/common/UseZoomForDSFPolicy.java",
......
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.content_public.common;
import org.chromium.base.annotations.JNINamespace;
/**
* This is a utility class to wrap browser_side_navigation_policy.cc.
*/
@JNINamespace("content")
public final class BrowserSideNavigationPolicy {
public static boolean isBrowserSideNavigationEnabled() {
return nativeIsBrowserSideNavigationEnabled();
}
private static native boolean nativeIsBrowserSideNavigationEnabled();
// Do not instantiate this class.
private BrowserSideNavigationPolicy() {}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment