ui: Android changes.

A series of changes related to android code organization under ui, that came
after the discussion in https://codereview.chromium.org/62203014/.

- Rename ui_jni_registrar.* to ui_base_jni_registrar.*
- Create a base/ directory under ui/android/java/src/org/chromium/ui, and move
some java files there.
- Move Surface java files into ui/android/java/src/org/chromium/ui/gl/ directory.
- Rename ui_jni_headers to ui_base_jni_headers.
- Create a new ui_android.gyp file under ui/android to contain ui_java target.

BUG=299841
R=tedchoc@chromium.org, yfriedman@chromium.org
TBR=ben

Review URL: https://codereview.chromium.org/70843003

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

11 files changed, 59 insertions, 17 deletions

diff --git a/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java b/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
index 1612f0b..f290c7e 100644
--- a/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
+++ b/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
 import java.util.List;
 
 import org.chromium.ui.R;
-import org.chromium.ui.ViewAndroidDelegate;
+import org.chromium.ui.base.ViewAndroidDelegate;
 
 /**
  * The Autofill suggestion popup that lists relevant suggestions.
diff --git a/ui/android/java/src/org/chromium/ui/ActivityWindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
index 190043a4..e5812df 100644
--- a/ui/android/java/src/org/chromium/ui/ActivityWindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -13,6 +13,8 @@ import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
 
+import org.chromium.ui.UiUtils;
+
 import java.io.ByteArrayOutputStream;
 
 /**
diff --git a/ui/android/java/src/org/chromium/ui/Clipboard.java b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
index b4e0c21..e62c84a 100644
--- a/ui/android/java/src/org/chromium/ui/Clipboard.java
+++ b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
diff --git a/ui/android/java/src/org/chromium/ui/LocalizationUtils.java b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
index f421d89..2a2474f 100644
--- a/ui/android/java/src/org/chromium/ui/LocalizationUtils.java
+++ b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
diff --git a/ui/android/java/src/org/chromium/ui/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
index d313681..f495767 100644
--- a/ui/android/java/src/org/chromium/ui/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -13,15 +13,16 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+import org.chromium.ui.R;
+import org.chromium.ui.base.WindowAndroid;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.ui.WindowAndroid;
-
 /**
  * A dialog that is triggered from a file input field that allows a user to select a file based on
  * a set of accepted file types. The path of the selected file is passed to the native dialog.
diff --git a/ui/android/java/src/org/chromium/ui/ViewAndroid.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroid.java
index 694f421..e91911c 100644
--- a/ui/android/java/src/org/chromium/ui/ViewAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroid.java
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.view.View;
 
 import org.chromium.base.JNINamespace;
-import org.chromium.ui.ViewAndroidDelegate;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ViewAndroidDelegate;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * From the Chromium architecture point of view, ViewAndroid and its native counterpart
diff --git a/ui/android/java/src/org/chromium/ui/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
index 531dce8..34d280a 100644
--- a/ui/android/java/src/org/chromium/ui/ViewAndroidDelegate.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.view.View;
 
@@ -31,4 +31,4 @@ public interface ViewAndroidDelegate {
      * @param anchorView The anchor view that needs to be released.
      */
     void releaseAnchorView(View anchorView);
-}
\ No newline at end of file
+}
diff --git a/ui/android/java/src/org/chromium/ui/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
index 20bb64c..3c48272 100644
--- a/ui/android/java/src/org/chromium/ui/WindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTextureListener.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java
index 7623f79..6e2d6fe 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTextureListener.java
+++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui.gfx;
+package org.chromium.ui.gl;
 
 import android.graphics.SurfaceTexture;
 
diff --git a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTexturePlatformWrapper.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
index 1e77f38..227c27f 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTexturePlatformWrapper.java
+++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui.gfx;
+package org.chromium.ui.gl;
 
 import android.graphics.SurfaceTexture;
 import android.os.Build;
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp
new file mode 100644
index 0000000..b9e3d69
--- /dev/null
+++ b/ui/android/ui_android.gyp
@@ -0,0 +1,39 @@
+# Copyright 2013 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.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'window_open_disposition_java',
+      'type': 'none',
+      'sources': [
+        'java/WindowOpenDisposition.template',
+      ],
+      'variables': {
+        'package_name': 'org/chromium/ui',
+        'template_deps': ['../base/window_open_disposition_list.h'],
+      },
+      'includes': [ '../../build/android/java_cpp_template.gypi' ],
+    },
+    {
+      'target_name': 'ui_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': '../../ui/android/java',
+        'has_java_resources': 1,
+        'R_package': 'org.chromium.ui',
+        'R_package_relpath': 'org/chromium/ui',
+        'java_strings_grd': 'android_ui_strings.grd',
+      },
+      'dependencies': [
+        '../../base/base.gyp:base_java',
+        'window_open_disposition_java',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+  ],
+}