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 bbf71012109650a0d0bbe4d76e7f079c8b53e201..7cb53e8febd563c98806dc6f42eb4c2a43c1a51e 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
@@ -43,7 +43,7 @@ import org.chromium.components.navigation_interception.InterceptNavigationDelega |
import org.chromium.components.navigation_interception.NavigationParams; |
import org.chromium.net.GURLUtils; |
import org.chromium.ui.gfx.DeviceDisplayInfo; |
-import org.chromium.ui.gfx.NativeWindow; |
+import org.chromium.ui.gfx.WindowAndroid; |
import java.io.File; |
import java.lang.annotation.Annotation; |
@@ -285,8 +285,7 @@ public class AwContents { |
int nativeWebContents = nativeGetWebContents(mNativeAwContents); |
mContentViewCore.initialize(containerView, internalAccessAdapter, |
- nativeWebContents, |
- new AwNativeWindow(mContainerView.getContext()), |
+ nativeWebContents, new AwWindowAndroid(mContainerView.getContext()), false, |
joth
2013/04/18 01:41:17
could you add a bug link here about the fact the A
aurimas (slooooooooow)
2013/04/18 02:49:57
Done.
|
isAccessFromFileURLsGrantedByDefault); |
mContentViewCore.setContentViewClient(mContentsClient); |
mLayoutSizer = new AwLayoutSizer(new AwLayoutSizerDelegate()); |
@@ -531,8 +530,8 @@ public class AwContents { |
// set it correctly when when we copy the settings from the old ContentViewCore |
// into the new one. |
newCore.initialize(mContainerView, mInternalAccessAdapter, |
- newWebContentsPtr, new AwNativeWindow(mContainerView.getContext()), |
- false); |
+ newWebContentsPtr, new AwWindowAndroid(mContainerView.getContext()), |
+ false, false); |
newCore.setContentViewClient(mContentsClient); |
mContentsClient.installWebContentsObserver(newCore); |