content/shell/android/java/src/org/chromium/content_shell/Shell.java - Issue 10823207: Consolidate ContentViewCore::Load* functions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/java/src/org/chromium/content_shell/Shell.java

Issue 10823207: Consolidate ContentViewCore::Load* functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@cleanup_load

Patch Set: Rebase. Add extra_headers to LoadUrlParams. Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java ('K') | « content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java

diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java

index 9901a6c19118ef946d8d50e650d71411a8d069a3..aa3418105f7000aa03059ca3062d0d4e27d6b064 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java

+++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java

@@ -22,6 +22,7 @@ import android.widget.TextView.OnEditorActionListener;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.content.browser.ContentView;

+import org.chromium.content.browser.LoadUrlParams;

/**

* Container for the various UI components that make up a shell window.

@@ -116,7 +117,7 @@ public class Shell extends LinearLayout {

if (TextUtils.equals(url, mContentView.getUrl())) {

mContentView.reload();

} else {

- mContentView.loadUrlWithoutUrlSanitization(sanitizeUrl(url));

+ mContentView.loadUrl(new LoadUrlParams(sanitizeUrl(url)));

}

mUrlTextView.clearFocus();

}