[Android] Rename NativeWindow to WindowAndroid.

Renaming NativeWindow to WindowAndroid for consistency with C++ name of window_android.

Also removing AwNativeWindow as according to joth@ it is no longer isued in WebView.

BUG=233064

Review URL: https://chromiumcodereview.appspot.com/14169011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195101 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 35 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 bbf7101..1d8651c 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,6 @@ 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 java.io.File;
 import java.lang.annotation.Annotation;
@@ -284,10 +283,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 +528,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);
 
diff --git a/android_webview/java/src/org/chromium/android_webview/AwNativeWindow.java b/android_webview/java/src/org/chromium/android_webview/AwNativeWindow.java
deleted file mode 100644
index 31f77dc..0000000
--- a/android_webview/java/src/org/chromium/android_webview/AwNativeWindow.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.android_webview;
-
-import android.content.Context;
-import android.content.Intent;
-
-import org.chromium.ui.gfx.NativeWindow;
-
-public class AwNativeWindow extends NativeWindow {
-    public AwNativeWindow(Context context) {
-        super(context);
-    }
-
-    // The following stubs are required for displaying a file picker which is
-    // unsupported in the WebView.
-    public void sendBroadcast(Intent intent) {
-    }
-
-    public boolean showIntent(Intent intent, IntentCallback callback, String error) {
-        return false;
-    }
-
-    public void showError(String error) {
-    }
-}