diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 14:21:48 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 14:21:48 +0000 |
| commit | 2e516180799e2a4ff2e3c4da7924627550280fbb (patch) | |
| tree | 570ca69fa520dbcd5d96bc7ba4774a478723629b /android_webview/java | |
| parent | d674b332b0bd5945c8471466867935825ae19dea (diff) | |
| download | chromium_src-2e516180799e2a4ff2e3c4da7924627550280fbb.zip chromium_src-2e516180799e2a4ff2e3c4da7924627550280fbb.tar.gz chromium_src-2e516180799e2a4ff2e3c4da7924627550280fbb.tar.bz2 | |
Re-apply: [Android] Fix WebView tests breakage after http://crrev.com/10916160
Original CL: https://codereview.chromium.org/10947028
Now with DEPS update.
BUG=116131
Review URL: https://codereview.chromium.org/10947032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java')
| -rw-r--r-- | android_webview/java/android_webview_apk.xml | 1 | ||||
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml index f283c19..d35ab7e 100644 --- a/android_webview/java/android_webview_apk.xml +++ b/android_webview/java/android_webview_apk.xml @@ -25,6 +25,7 @@ <fileset file="${out.dir}/java/libs/chromium_content.jar"/> <fileset file="${out.dir}/java/libs/chromium_media.jar"/> <fileset file="${out.dir}/java/libs/chromium_net.jar"/> + <fileset file="${out.dir}/java/libs/chromium_ui.jar"/> <fileset file="${out.dir}/java/libs/chromium_web_contents_delegate_android.jar"/> </path> <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/> 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 69c1526..0481380 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); } |