Photo Picker dialog: Pipe through the MIME type selections from the web page.

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
index 24bdc226e65f2ba107dbd0408fd2e8f48bb92f06..59ebda99fa205b7691396e0982c05b6db7f6ba8e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.ui.PhotoPickerListener;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -100,6 +99,9 @@ public class PickerCategoryView extends RelativeLayout
     // Whether the connection to the service has been established.
     private boolean mServiceReady;
 
+    // The MIME types requested.
+    private List<String> mMimeTypes;
+
     // A list of files to use for testing (instead of reading files on disk).
     private static List<PickerBitmap> sTestFiles;
 
@@ -119,8 +121,6 @@ public class PickerCategoryView extends RelativeLayout
         mDecoderServiceHost = new DecoderServiceHost(this);
         mDecoderServiceHost.bind(mContext);
 
-        enumerateBitmaps();
-
         mSelectionDelegate = new SelectionDelegate<PickerBitmap>();
 
         View root = LayoutInflater.from(context).inflate(R.layout.photo_picker_dialog, this);
@@ -183,14 +183,18 @@ public class PickerCategoryView extends RelativeLayout
      * @param dialog The dialog showing us.
      * @param listener The listener who should be notified of actions.
      * @param multiSelectionAllowed Whether to allow the user to select more than one image.
+     * @param mimeTypes A list of mime types to show in the dialog.
      */
-    public void initialize(
-            PhotoPickerDialog dialog, PhotoPickerListener listener, boolean multiSelectionAllowed) {
+    public void initialize(PhotoPickerDialog dialog, PhotoPickerListener listener,
+            boolean multiSelectionAllowed, List<String> mimeTypes) {
         if (!multiSelectionAllowed) mSelectionDelegate.setSingleSelectionMode();
 
         mDialog = dialog;
         mMultiSelectionAllowed = multiSelectionAllowed;
         mListener = listener;
+        mMimeTypes = new ArrayList<>(mimeTypes);
+
+        enumerateBitmaps();
 
         mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
@@ -327,8 +331,7 @@ public class PickerCategoryView extends RelativeLayout
             mWorkerTask.cancel(true);
         }
 
-        mWorkerTask =
-                new FileEnumWorkerTask(this, new MimeTypeFileFilter(Arrays.asList("image/*")));
+        mWorkerTask = new FileEnumWorkerTask(this, new MimeTypeFileFilter(mMimeTypes));
         mWorkerTask.execute();
     }