[Android] Rename NativeWindow to WindowAndroid.

ui/ui.gyp

Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 17e98ac8293db2cece71001e7f0ef12453e8190a..930861cb7011b06ecbf2edba3571de8f003216b7 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -41,6 +41,8 @@
       'sources' : [
         'android/ui_jni_registrar.cc',
         'android/ui_jni_registrar.h',
+        'android/window_android.cc',
+        'android/window_android.h',
         'base/accelerators/accelerator.cc',
         'base/accelerators/accelerator.h',
         'base/accelerators/platform_accelerator.h',
@@ -358,8 +360,6 @@
         'gfx/android/device_display_info.h',
         'gfx/android/java_bitmap.cc',
         'gfx/android/java_bitmap.h',
-        'gfx/android/window_android.cc',
-        'gfx/android/window_android.h',
         'gfx/blit.cc',
         'gfx/blit.h',
         'gfx/break_list.h',
@@ -881,12 +881,12 @@
            'target_name': 'ui_jni_headers',
            'type': 'none',
            'sources': [
+             'android/java/src/org/chromium/ui/Clipboard.java',
              'android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
              'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
-             'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
              'android/java/src/org/chromium/ui/LocalizationUtils.java',
              'android/java/src/org/chromium/ui/SelectFileDialog.java',
-             'android/java/src/org/chromium/ui/Clipboard.java',
+             'android/java/src/org/chromium/ui/WindowAndroid.java',
            ],
            'variables': {
              'jni_gen_package': 'ui',