content/shell/android/java/src/org/chromium/content_shell/Shell.java - Issue 831523005: Remove most native WebContents references from Java

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 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 11 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/public/android/java/src/org/chromium/content_public/browser/WebContents.java ('k') | content/shell/browser/shell_android.cc » ('j') | 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 79edb4858f2b464daa694c971b9145248c946340..4a40a5184509f2350f111dd8d507c666b31f166d 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

@@ -286,15 +286,15 @@ public class Shell extends LinearLayout {

/**

* Initializes the ContentView based on the native tab contents pointer passed in.

- * @param nativeWebContents The pointer to the native tab contents object.

+ * @param webContents A {@link WebContents} object.

@SuppressWarnings("unused")

@CalledByNative

- private void initFromNativeTabContents(long nativeWebContents) {

+ private void initFromNativeTabContents(WebContents webContents) {

Context context = getContext();

mContentViewCore = new ContentViewCore(context);

ContentView cv = ContentView.newInstance(context, mContentViewCore);

- mContentViewCore.initialize(cv, cv, nativeWebContents, mWindow);

+ mContentViewCore.initialize(cv, cv, webContents, mWindow);

mContentViewCore.setContentViewClient(mContentViewClient);

mWebContents = mContentViewCore.getWebContents();

mNavigationController = mWebContents.getNavigationController();