content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 317733005: Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..."

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/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 317733005: Merge 273865 "Use LoadURLWithParams in ChromeWebContentsDelegate..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/

Patch Set: Created 6 years, 6 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

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

===================================================================

--- content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java (revision 274887)

+++ content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java (working copy)

@@ -828,7 +828,8 @@

params.mPostData,

params.mBaseUrlForDataUrl,

params.mVirtualUrlForDataUrl,

- params.mCanLoadLocalResources);

+ params.mCanLoadLocalResources,

+ params.mIsRendererInitiated);

}

/**

@@ -3090,7 +3091,8 @@

byte[] postData,

String baseUrlForDataUrl,

String virtualUrlForDataUrl,

- boolean canLoadLocalResources);

+ boolean canLoadLocalResources,

+ boolean isRendererInitiated);

private native String nativeGetURL(long nativeContentViewCoreImpl);