[Android] Rename NativeWindow to WindowAndroid.

android_webview/java/src/org/chromium/android_webview/AwContents.java

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..4172c8768fdc497da6dd6f078dbfd672894dd66a 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.WindowAndroid;

[benm (inactive), 2013/04/18 19:40:04]

can we remove this import?

[aurimas (slooooooooow), 2013/04/18 20:46:16]

Done.

 
 import java.io.File;
 import java.lang.annotation.Annotation;
@@ -284,10 +284,8 @@ public class AwContents {
         mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeAwContents));
 
         int nativeWebContents = nativeGetWebContents(mNativeAwContents);
-        mContentViewCore.initialize(containerView, internalAccessAdapter,
-                nativeWebContents,
-                new AwNativeWindow(mContainerView.getContext()),
-                isAccessFromFileURLsGrantedByDefault);
+        mContentViewCore.initialize(containerView, internalAccessAdapter, nativeWebContents,
+                null, isAccessFromFileURLsGrantedByDefault);
         mContentViewCore.setContentViewClient(mContentsClient);
         mLayoutSizer = new AwLayoutSizer(new AwLayoutSizerDelegate());
         mContentViewCore.setContentSizeChangeListener(new AwContentStateChangeListener());
@@ -531,8 +529,7 @@ 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, null, false);
         newCore.setContentViewClient(mContentsClient);
         mContentsClient.installWebContentsObserver(newCore);