diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 16:05:17 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 16:05:17 +0000 |
| commit | ab6dfe48b48545663754d55b0b04c42e86e10cfb (patch) | |
| tree | 294f0bb6f5ff97005bacbef6f9897afcada8aee1 | |
| parent | cc4bbf155563203f195b278a46fdbbd45b9f101e (diff) | |
| download | chromium_src-ab6dfe48b48545663754d55b0b04c42e86e10cfb.zip chromium_src-ab6dfe48b48545663754d55b0b04c42e86e10cfb.tar.gz chromium_src-ab6dfe48b48545663754d55b0b04c42e86e10cfb.tar.bz2 | |
[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
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 7 |
1 files changed, 3 insertions, 4 deletions
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); } |