android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 10947032: Re-apply: [Android] Fix WebView tests breakage after http://crrev.com/10916160

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: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 10947032: Re-apply: [Android] Fix WebView tests breakage after http://crrev.com/10916160 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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 | « android_webview/java/android_webview_apk.xml ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java

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 69c1526c331c6b624f462bc3a6dcc0f75f70eb10..0481380996096e2664edfce53789d9d95776f335 100644

--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java

+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -11,6 +11,7 @@ import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.common.CleanupReference;

+import org.chromium.ui.gfx.NativeWindow;

/**

* Exposes the native AwContents class, and together these classes wrap the ContentViewCore

@@ -57,7 +58,8 @@ public class AwContents {

public AwContents(ViewGroup containerView,

ContentViewCore.InternalAccessDelegate internalAccessAdapter,

ContentViewCore contentViewCore, AwContentsClient contentsClient,

- boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) {

+ NativeWindow nativeWindow, boolean privateBrowsing,

+ boolean isAccessFromFileURLsGrantedByDefault) {

mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);

mContentViewCore = contentViewCore;

mContentsClient = contentsClient;

@@ -65,7 +67,8 @@ public class AwContents {

// TODO: upstream the needed ContentViewCore initialization method.

// mContentViewCore.initialize(containerView, internalAccessAdapter, false,

- // nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault);

+ // nativeGetWebContents(mNativeAwContents), nativeWindow,

+ // isAccessFromFileURLsGrantedByDefault);

mContentViewCore.setContentViewClient(contentsClient);

}