From ab6dfe48b48545663754d55b0b04c42e86e10cfb Mon Sep 17 00:00:00 2001 From: "leandrogracia@chromium.org" Date: Fri, 21 Sep 2012 16:05:17 +0000 Subject: [Android] Re-enable the ContentViewCore initialization in WebView. This was temporarily disabled until the appropriate construction and initialization methods where synced upstream, but it was not re-enabled after this happened. BUG=145874 Review URL: https://chromiumcodereview.appspot.com/10965036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157997 0039d316-1c4b-4281-b951-d872f2087c98 --- .../java/src/org/chromium/android_webview/AwContents.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'android_webview/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 c0a1a6f..6ced2b2 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -78,10 +78,9 @@ public class AwContents { mContentsClient = contentsClient; mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeAwContents)); - // TODO: upstream the needed ContentViewCore initialization method. - // mContentViewCore.initialize(containerView, internalAccessAdapter, false, - // nativeGetWebContents(mNativeAwContents), nativeWindow, - // isAccessFromFileURLsGrantedByDefault); + mContentViewCore.initialize(containerView, internalAccessAdapter, + nativeGetWebContents(mNativeAwContents), nativeWindow, + isAccessFromFileURLsGrantedByDefault); mContentViewCore.setContentViewClient(contentsClient); } -- cgit v1.1