ui: Android changes.

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235369

[tfarina, 2013-11-12 23:17:49]

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/Clipboard.java:5: package
org.chromium.ui;
does this needs to be updated to org.chromium.ui.base?

[Ted C, 2013-11-13 01:45:22]

lgtm (w/ the package moves)

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/Clipboard.java:5: package
org.chromium.ui;
On 2013/11/12 23:17:50, tfarina wrote:
> does this needs to be updated to org.chromium.ui.base?

Yeah, it should be.  The package definition should match the file path.

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java (right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java:5: package
org.chromium.ui.gfx;
this should be update to .gl

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
(right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java:5:
package org.chromium.ui.gfx;
same

[Yaron, 2013-11-13 05:34:38]

On 2013/11/13 01:45:22, Ted C wrote:
> lgtm (w/ the package moves)
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> ui/android/java/src/org/chromium/ui/base/Clipboard.java:5: package
> org.chromium.ui;
> On 2013/11/12 23:17:50, tfarina wrote:
> > does this needs to be updated to org.chromium.ui.base?
> 
> Yeah, it should be.  The package definition should match the file path.
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> File ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java
(right):
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java:5: package
> org.chromium.ui.gfx;
> this should be update to .gl
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> File ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
> (right):
> 
>
https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
> ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java:5:
> package org.chromium.ui.gfx;
> same

lgtm when Ted's happy

The high-level description Ted gave on https://codereview.chromium.org/62203014/
is accurate. We treat a "project" or jar of java code as a unit and that goes in
the relevant <project>/android folder.
http://www.chromium.org/developers/coding-style/java is still relevant

[tfarina, 2013-11-13 22:20:25]

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/Clipboard.java (right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/Clipboard.java:5: package
org.chromium.ui;
On 2013/11/13 01:45:22, Ted C wrote:
> On 2013/11/12 23:17:50, tfarina wrote:
> > does this needs to be updated to org.chromium.ui.base?
> 
> Yeah, it should be.  The package definition should match the file path.

Done.

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java (right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java:5: package
org.chromium.ui.gfx;
On 2013/11/13 01:45:22, Ted C wrote:
> this should be update to .gl

Done.

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
(right):

https://codereview.chromium.org/70843003/diff/180001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java:5:
package org.chromium.ui.gfx;
On 2013/11/13 01:45:22, Ted C wrote:
> same

Done.

[commit-bot: I haz the power, 2013-11-13 22:27:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/300001

[commit-bot: I haz the power, 2013-11-13 23:39:32]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[newt (away), 2013-11-13 23:51:41]

On 2013/11/13 23:39:32, I haz the power (commit-bot) wrote:
> Sorry for I got bad news for ya.
> Compile failed with a clobber build on android_clang_dbg.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
> Your code is likely broken or HEAD is junk. Please ensure your
> code is not broken then alert the build sheriffs.
> Look at the try server FAQ for more details.

I think ActivityWindowAndroid.java should be in ui/base along with
WindowAndroid.java

[commit-bot: I haz the power, 2013-11-14 23:49:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/550001

[newt (away), 2013-11-15 00:48:43]

this still doesn't compile. you should verify that compilation succeeds locally
by building these targets:

ninja -C out/Debug chromium_testshell content_shell_apk android_webview_apk

[tfarina, 2013-11-15 00:56:57]

On 2013/11/15 00:48:43, newt wrote:
> this still doesn't compile. you should verify that compilation succeeds
locally
> by building these targets:
> 
> ninja -C out/Debug chromium_testshell content_shell_apk android_webview_apk

How long it takes to setup chromium android? I have never set it up.

I thought as iOS development it wasn't possible to fully build it as you guys
develop on private.

[tfarina, 2013-11-15 01:03:57]

How do you know it doesn't compile? I don't see the android bots yet in
rietveld.

Have you tried locally? Can you help me fix the compilation? I think you
probably know what I'm doing wrong.

Thanks!

[newt (away), 2013-11-15 01:29:04]

On 2013/11/15 01:03:57, tfarina wrote:
> How do you know it doesn't compile? I don't see the android bots yet in
> rietveld.
> 
> Have you tried locally? Can you help me fix the compilation? I think you
> probably know what I'm doing wrong.
> 
> Thanks!

Yea, I tried this locally. You should be able to build the public parts of
Chrome Android pretty easily if you've already got a Chrome checkout:
https://code.google.com/p/chromium/wiki/AndroidBuildInstructions (note that you
do *not* need to download the Oracle Java JDK as the instructions say... that
changed recently)

[newt (away), 2013-11-15 01:39:36]

On 2013/11/15 01:29:04, newt wrote:
> On 2013/11/15 01:03:57, tfarina wrote:
> > How do you know it doesn't compile? I don't see the android bots yet in
> > rietveld.
> > 
> > Have you tried locally? Can you help me fix the compilation? I think you
> > probably know what I'm doing wrong.
> > 
> > Thanks!
> 
> Yea, I tried this locally. You should be able to build the public parts of
> Chrome Android pretty easily if you've already got a Chrome checkout:
> https://code.google.com/p/chromium/wiki/AndroidBuildInstructions (note that
you
> do *not* need to download the Oracle Java JDK as the instructions say... that
> changed recently)

And here's what needs fixing in any case:

diff --git a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
index 6d33c67..e5812df 100644
--- a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
@@ -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/base/SelectFileDialog.java
b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
index 6482270..b9cbfdc 100644
--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -13,15 +13,15 @@ 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 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.base.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.


Thanks!

[commit-bot: I haz the power, 2013-11-15 02:20:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/550001

[commit-bot: I haz the power, 2013-11-15 04:17:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/730001

[commit-bot: I haz the power, 2013-11-15 05:49:55]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[commit-bot: I haz the power, 2013-11-15 12:34:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/940001

[commit-bot: I haz the power, 2013-11-15 13:24:47]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[commit-bot: I haz the power, 2013-11-15 13:32:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/70843003/1150001

[commit-bot: I haz the power, 2013-11-15 16:31:59]

Retried try job too often on win_rel for step(s) nacl_integration
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[tfarina, 2013-11-15 17:53:11]

Committed patchset #14 manually as r235369 (presubmit successful).