chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.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: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java

Issue 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Kept same error checking behavior for aw_contents.cc 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 | « chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImpl.java » ('j') | chrome/browser/android/content_view_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java

index 7581fefdccffa60caf291b031e202e2c5938f08a..be1bc6e1f7e3f69b9b5514afc7ab8d6ac935485c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java

@@ -9,6 +9,7 @@ import android.os.SystemClock;

import org.chromium.base.CalledByNative;

import org.chromium.chrome.browser.Tab;

import org.chromium.chrome.browser.profiles.Profile;

+import org.chromium.content_public.browser.WebContents;

/**

* Bridges between the C++ and Java {@link TabModel} interfaces.

@@ -98,12 +99,12 @@ public abstract class TabModelJniBridge implements TabModel {

/**

* Creates a Tab with the given WebContents.

* @param incognito Whether or not the tab is incognito.

- * @param nativeWebContents Pointer to the native WebContents.

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

* @param parentId ID of the parent.

@CalledByNative

- protected abstract Tab createTabWithNativeContents(

- boolean incognito, long nativeWebContents, int parentId);

+ protected abstract Tab createTabWithWebContents(

+ boolean incognito, WebContents webContents, int parentId);

/**

* Creates a Tab with the given WebContents for DevTools.