Allow <input type="file" multiple /> to be used on Android JB MR2+.

Allow <input type="file" multiple /> to be used on Android JB MR2+.

Android JellyBean MR2 (API 18) introduced an Intent extra which tells the
file picker that it can select multiple files. Each of the files will be
returned as a ClipData entry on the completed Intent.

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

[Peter Beverloo, 2014-08-05 17:30:26]

+miguelg and aurimas for review

[Miguel Garcia, 2014-08-05 18:01:00]

lgtm

Looks really good. Thanks for taking this one!

https://codereview.chromium.org/443683002/diff/20001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java (right):

https://codereview.chromium.org/443683002/diff/20001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java:195: if
(results.getData() == null && results.getClipData() != null) {
can you check that the |results| intent in fact contains the
EXTRA_ALLOW_MULTIPLE parameter?

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
File ui/shell_dialogs/select_file_dialog_android.cc (right):

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
ui/shell_dialogs/select_file_dialog_android.cc:57: jsize length =
env->GetArrayLength(filepaths);
can you DCHECK that env->GetArrayLength(filepaths) == 
env->GetArrayLength(display_names) ?

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
ui/shell_dialogs/select_file_dialog_android.cc:116: bool accept_multiple_files =
SelectFileDialog::SELECT_OPEN_MULTI_FILE == type;
Can you check that you are in JB MR2 or higher just to be sure?

[Peter Beverloo, 2014-08-05 18:44:53]

https://codereview.chromium.org/443683002/diff/20001/ui/android/java/src/org/...
File ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java (right):

https://codereview.chromium.org/443683002/diff/20001/ui/android/java/src/org/...
ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java:195: if
(results.getData() == null && results.getClipData() != null) {
On 2014/08/05 18:01:00, Miguel Garcia wrote:
> can you check that the |results| intent in fact contains the
> EXTRA_ALLOW_MULTIPLE parameter?

|results| is the resulting Intent, not the contentIntent we establish earlier
on. I did add the JB MR2+ check per your other comment.

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
File ui/shell_dialogs/select_file_dialog_android.cc (right):

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
ui/shell_dialogs/select_file_dialog_android.cc:57: jsize length =
env->GetArrayLength(filepaths);
On 2014/08/05 18:01:00, Miguel Garcia wrote:
> can you DCHECK that env->GetArrayLength(filepaths) == 
> env->GetArrayLength(display_names) ?
> 

Done.

https://codereview.chromium.org/443683002/diff/20001/ui/shell_dialogs/select_...
ui/shell_dialogs/select_file_dialog_android.cc:116: bool accept_multiple_files =
SelectFileDialog::SELECT_OPEN_MULTI_FILE == type;
On 2014/08/05 18:01:00, Miguel Garcia wrote:
> Can you check that you are in JB MR2 or higher just to be sure? 

I can add this check in the Java file, but I don't think there's any need for it
(the Intent string will just be ignored by the file pickers).

I did have to guard the clipData() call behind a version check, which didn't
exist yet in ICS.

[Peter Beverloo, 2014-08-06 13:54:06]

The CQ bit was checked by peter@chromium.org

[commit-bot: I haz the power, 2014-08-06 13:55:17]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/peter@chromium.org/443683002/40001

[commit-bot: I haz the power, 2014-08-06 16:04:38]

Change committed as 287777