diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 13:39:16 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 13:39:16 +0000 |
| commit | e195551a4cc3d36f9fa95bb3b62eb7d5fbd855e1 (patch) | |
| tree | 5f6d97ecae8a09cbfbd15a6716891e1504612236 /android_webview/java | |
| parent | e60447f3763720b8fe526e9d92b4c86b4b0a9436 (diff) | |
| download | chromium_src-e195551a4cc3d36f9fa95bb3b62eb7d5fbd855e1.zip chromium_src-e195551a4cc3d36f9fa95bb3b62eb7d5fbd855e1.tar.gz chromium_src-e195551a4cc3d36f9fa95bb3b62eb7d5fbd855e1.tar.bz2 | |
Revert 157543 - [Android] Fix WebView tests breakage after http://crrev.com/10916160
R=benm@chromium.org,android-webview-reviews@google.com
BUG=116131
Review URL: https://codereview.chromium.org/10947028
TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/10941032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157544 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, 2 insertions, 6 deletions
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml index d35ab7e..f283c19 100644 --- a/android_webview/java/android_webview_apk.xml +++ b/android_webview/java/android_webview_apk.xml @@ -25,7 +25,6 @@ <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 0481380..69c1526 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -11,7 +11,6 @@ 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 @@ -58,8 +57,7 @@ public class AwContents { public AwContents(ViewGroup containerView, ContentViewCore.InternalAccessDelegate internalAccessAdapter, ContentViewCore contentViewCore, AwContentsClient contentsClient, - NativeWindow nativeWindow, boolean privateBrowsing, - boolean isAccessFromFileURLsGrantedByDefault) { + boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) { mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing); mContentViewCore = contentViewCore; mContentsClient = contentsClient; @@ -67,8 +65,7 @@ public class AwContents { // TODO: upstream the needed ContentViewCore initialization method. // mContentViewCore.initialize(containerView, internalAccessAdapter, false, - // nativeGetWebContents(mNativeAwContents), nativeWindow, - // isAccessFromFileURLsGrantedByDefault); + // nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault); mContentViewCore.setContentViewClient(contentsClient); } |