summaryrefslogtreecommitdiffstats
path: root/android_webview/java
diff options
context:
space:
mode:
authormkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 14:27:56 +0000
committermkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-10 14:27:56 +0000
commitc204ff5c7869a0db2ecc9b9722aabe5b85e1d998 (patch)
tree6cf209045fa22b7c56c4a8aac819290f13a7ad20 /android_webview/java
parentfc6d081efc78e8189c89f1b9fdbfa5a71105d4c2 (diff)
downloadchromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.zip
chromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.tar.gz
chromium_src-c204ff5c7869a0db2ecc9b9722aabe5b85e1d998.tar.bz2
[android_webview] Use AwContents loadUrl method instead of ContentViewCore.
This introduces a loadUrl method on AwContents and modifies all of our test code to use that method instead of the on ContentViewCore. BUG=154558 Java-only change, ran through android FYI. NOTRY=true Review URL: https://codereview.chromium.org/11028094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContents.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index b7995fd..2a7377b 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -18,6 +18,7 @@ import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
import org.chromium.chrome.browser.component.navigation_interception.InterceptNavigationDelegate;
import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.LoadUrlParams;
import org.chromium.content.browser.NavigationHistory;
import org.chromium.content.common.CleanupReference;
import org.chromium.net.X509Util;
@@ -185,6 +186,17 @@ public class AwContents {
return null;
}
+ /**
+ * Load url without fixing up the url string. Consumers of ContentView are responsible for
+ * ensuring the URL passed in is properly formatted (i.e. the scheme has been added if left
+ * off during user input).
+ *
+ * @param pararms Parameters for this load.
+ */
+ public void loadUrl(LoadUrlParams params) {
+ mContentViewCore.loadUrl(params);
+ }
+
//--------------------------------------------------------------------------------------------
// WebView[Provider] method implementations (where not provided by ContentViewCore)
//--------------------------------------------------------------------------------------------