Remove some //chrome dependencies from PhotoPicker.

This prepares it for componentization and re-use by WebLayer.

Some PhotoPicker glue code is moved from UiUtils to SelectFileDialog
because UiUtils can't depend on WindowAndroid. SelectFileDialog is the
only client that calls showPhotoPicker, so it seems like a good place to
hold the delegate code.

Bug: 1110930
Change-Id: I21afcaf0bcccc739f63f75ee745d0c519331e763
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2361123Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799815}

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -93,10 +93,12 @@ import org.chromium.content_public.browser.ChildProcessLauncherHelper;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.content_public.common.ContentSwitches;
 import org.chromium.ui.ContactsPickerListener;
-import org.chromium.ui.PhotoPickerListener;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.Clipboard;
+import org.chromium.ui.base.PhotoPickerDelegate;
+import org.chromium.ui.base.PhotoPickerListener;
 import org.chromium.ui.base.SelectFileDialog;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -213,14 +215,16 @@ public class ProcessInitializationHandler {
         Clipboard.getInstance().setImageFileProvider(new ClipboardImageFileProvider());
 
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.NEW_PHOTO_PICKER)) {
-            UiUtils.setPhotoPickerDelegate(new UiUtils.PhotoPickerDelegate() {
+            SelectFileDialog.setPhotoPickerDelegate(new PhotoPickerDelegate() {
                 private PhotoPickerDialog mDialog;
 
                 @Override
-                public void showPhotoPicker(Context context, PhotoPickerListener listener,
-                        boolean allowMultiple, List<String> mimeTypes) {
-                    mDialog = new PhotoPickerDialog(context, context.getContentResolver(), listener,
-                            allowMultiple, mimeTypes);
+                public void showPhotoPicker(WindowAndroid windowAndroid,
+                        PhotoPickerListener listener, boolean allowMultiple,
+                        List<String> mimeTypes) {
+                    mDialog = new PhotoPickerDialog(windowAndroid,
+                            windowAndroid.getContext().get().getContentResolver(), listener,
+                            allowMultiple, mimeTypes, new VrModeProviderImpl());
                     mDialog.getWindow().getAttributes().windowAnimations =
                             R.style.PickerDialogAnimation;
                     mDialog.show();

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

@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.photo_picker;
 
 import android.app.Activity;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.VisibleForTesting;
@@ -17,7 +16,9 @@ import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
-import org.chromium.ui.PhotoPickerListener;
+import org.chromium.ui.base.PhotoPickerListener;
+import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.vr.VrModeProvider;
 
 import java.util.List;
 
@@ -27,8 +28,8 @@ import java.util.List;
  */
 public class PhotoPickerDialog
         extends AlertDialog implements PhotoPickerToolbar.PhotoPickerToolbarDelegate {
-    // Our context.
-    private Context mContext;
+    // Our window.
+    private WindowAndroid mWindowAndroid;
 
     // The category we're showing photos for.
     private PickerCategoryView mCategoryView;
@@ -79,22 +80,25 @@ public class PhotoPickerDialog
 
     /**
      * The PhotoPickerDialog constructor.
-     * @param context The context to use.
+     * @param windowAndroid The window of the hosting Activity.
      * @param contentResolver The ContentResolver to use to retrieve image metadata from disk.
      * @param listener The listener object that gets notified when an action is taken.
      * @param multiSelectionAllowed Whether the photo picker should allow multiple items to be
      *                              selected.
      * @param mimeTypes A list of mime types to show in the dialog.
+     * @param vrModeProvider Used to query VR mode state.
      */
-    public PhotoPickerDialog(Context context, ContentResolver contentResolver,
-            PhotoPickerListener listener, boolean multiSelectionAllowed, List<String> mimeTypes) {
-        super(context, R.style.Theme_Chromium_Fullscreen);
-        mContext = context;
+    public PhotoPickerDialog(WindowAndroid windowAndroid, ContentResolver contentResolver,
+            PhotoPickerListener listener, boolean multiSelectionAllowed, List<String> mimeTypes,
+            VrModeProvider vrModeProvider) {
+        super(windowAndroid.getContext().get(), R.style.Theme_Chromium_Fullscreen);
+
+        mWindowAndroid = windowAndroid;
         mListenerWrapper = new PhotoPickerListenerWrapper(listener);
 
         // Initialize the main content view.
-        mCategoryView =
-                new PickerCategoryView(context, contentResolver, multiSelectionAllowed, this);
+        mCategoryView = new PickerCategoryView(
+                windowAndroid, contentResolver, multiSelectionAllowed, this, vrModeProvider);
         mCategoryView.initialize(this, mListenerWrapper, mimeTypes);
         setView(mCategoryView);
     }
@@ -131,7 +135,7 @@ public class PhotoPickerDialog
                         dismiss();
                     }
                 }
-            }, ContextUtils.activityFromContext(mContext));
+            }, ContextUtils.activityFromContext(mWindowAndroid.getContext().get()));
         }
     }
 

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

@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.photo_picker;
 
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -31,15 +32,16 @@ import org.chromium.base.DiscardableReferencePool.DiscardableReference;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.vr.VrModeProviderImpl;
 import org.chromium.components.browser_ui.util.ConversionUtils;
+import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool;
 import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
 import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
 import org.chromium.net.MimeTypeFilter;
-import org.chromium.ui.PhotoPickerListener;
-import org.chromium.ui.UiUtils;
+import org.chromium.ui.base.PhotoPickerListener;
+import org.chromium.ui.base.SelectFileDialog;
+import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.vr.VrModeProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -90,8 +92,8 @@ public class PickerCategoryView extends RelativeLayout
     // The view containing the RecyclerView and the toolbar, etc.
     private SelectableListLayout<PickerBitmap> mSelectableListLayout;
 
-    // Our activity.
-    private ChromeActivity mActivity;
+    // The {@link WindowAndroid} for the {@link Activity}.
+    private WindowAndroid mWindowAndroid;
 
     // The ContentResolver to use to retrieve image metadata from disk.
     private ContentResolver mContentResolver;
@@ -190,15 +192,18 @@ public class PickerCategoryView extends RelativeLayout
     private ImageView mZoom;
 
     /**
-     * @param context The context to use.
+     * @param windowAndroid The window of the hosting {@link Activity}.
      * @param contentResolver The ContentResolver to use to retrieve image metadata from disk.
      * @param multiSelectionAllowed Whether to allow the user to select more than one image.
+     * @param vrModeProvider The VR mode provider for querying VR mode state.
      */
     @SuppressWarnings("unchecked") // mSelectableListLayout
-    public PickerCategoryView(Context context, ContentResolver contentResolver,
-            boolean multiSelectionAllowed, PhotoPickerToolbar.PhotoPickerToolbarDelegate delegate) {
-        super(context);
-        mActivity = (ChromeActivity) context;
+    public PickerCategoryView(WindowAndroid windowAndroid, ContentResolver contentResolver,
+            boolean multiSelectionAllowed, PhotoPickerToolbar.PhotoPickerToolbarDelegate delegate,
+            VrModeProvider vrModeProvider) {
+        super(windowAndroid.getContext().get());
+        mWindowAndroid = windowAndroid;
+        Context context = mWindowAndroid.getContext().get();
         mContentResolver = contentResolver;
         mMultiSelectionAllowed = multiSelectionAllowed;
 
@@ -221,7 +226,7 @@ public class PickerCategoryView extends RelativeLayout
                                             : R.string.photo_picker_select_image;
         PhotoPickerToolbar toolbar = (PhotoPickerToolbar) mSelectableListLayout.initializeToolbar(
                 R.layout.photo_picker_toolbar, mSelectionDelegate, titleId, 0, 0, null, false,
-                false, new VrModeProviderImpl());
+                false, vrModeProvider);
         toolbar.setNavigationOnClickListener(this);
         toolbar.setDelegate(delegate);
         Button doneButton = (Button) toolbar.findViewById(R.id.done);
@@ -231,7 +236,7 @@ public class PickerCategoryView extends RelativeLayout
 
         calculateGridMetrics();
 
-        mLayoutManager = new GridLayoutManager(mActivity, mColumns);
+        mLayoutManager = new GridLayoutManager(context, mColumns);
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(mLayoutManager);
         mSpacingDecoration = new GridSpacingItemDecoration(mColumns, mPadding);
@@ -279,7 +284,7 @@ public class PickerCategoryView extends RelativeLayout
         }
 
         if (mDecoderServiceHost != null) {
-            mDecoderServiceHost.unbind(mActivity);
+            mDecoderServiceHost.unbind(mWindowAndroid.getContext().get());
             mDecoderServiceHost = null;
         }
     }
@@ -492,7 +497,7 @@ public class PickerCategoryView extends RelativeLayout
 
     public LruCache<String, Thumbnail> getLowResThumbnails() {
         if (mLowResThumbnails == null || mLowResThumbnails.get() == null) {
-            mLowResThumbnails = mActivity.getReferencePool().put(
+            mLowResThumbnails = GlobalDiscardableReferencePool.getReferencePool().put(
                     new LruCache<String, Thumbnail>(mCacheSizeSmall));
         }
         return mLowResThumbnails.get();
@@ -500,7 +505,7 @@ public class PickerCategoryView extends RelativeLayout
 
     public LruCache<String, Thumbnail> getHighResThumbnails() {
         if (mHighResThumbnails == null || mHighResThumbnails.get() == null) {
-            mHighResThumbnails = mActivity.getReferencePool().put(
+            mHighResThumbnails = GlobalDiscardableReferencePool.getReferencePool().put(
                     new LruCache<String, Thumbnail>(mCacheSizeLarge));
         }
         return mHighResThumbnails.get();
@@ -508,7 +513,7 @@ public class PickerCategoryView extends RelativeLayout
 
     public LruCache<String, Thumbnail> getFullScreenBitmaps() {
         if (mFullScreenBitmaps == null || mFullScreenBitmaps.get() == null) {
-            mFullScreenBitmaps = mActivity.getReferencePool().put(
+            mFullScreenBitmaps = GlobalDiscardableReferencePool.getReferencePool().put(
                     new LruCache<String, Thumbnail>(mCacheSizeFullScreen));
         }
         return mFullScreenBitmaps.get();
@@ -537,14 +542,15 @@ public class PickerCategoryView extends RelativeLayout
      */
     private void calculateGridMetrics() {
         DisplayMetrics displayMetrics = new DisplayMetrics();
-        mActivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        Activity activity = (Activity) mWindowAndroid.getContext().get();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 
         int width = displayMetrics.widthPixels;
         int minSize =
-                mActivity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_min_size);
+                activity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_min_size);
         mPadding = mMagnifyingMode
                 ? 0
-                : mActivity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_gap);
+                : activity.getResources().getDimensionPixelSize(R.dimen.photo_picker_tile_gap);
         mColumns = mMagnifyingMode ? 1 : Math.max(1, (width - mPadding) / (minSize + mPadding));
         mImageWidth = (width - mPadding * (mColumns + 1)) / (mColumns);
         mImageHeight = mMagnifyingMode
@@ -572,7 +578,7 @@ public class PickerCategoryView extends RelativeLayout
         }
 
         mEnumStartTime = SystemClock.elapsedRealtime();
-        mWorkerTask = new FileEnumWorkerTask(mActivity.getWindowAndroid(), this,
+        mWorkerTask = new FileEnumWorkerTask(mWindowAndroid, this,
                 new MimeTypeFilter(mMimeTypes, true), mMimeTypes, mContentResolver);
         mWorkerTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
@@ -648,7 +654,7 @@ public class PickerCategoryView extends RelativeLayout
             @PhotoPickerListener.PhotoPickerAction int action, Uri[] photos, int umaId) {
         mListener.onPhotoPickerUserAction(action, photos);
         mDialog.dismiss();
-        UiUtils.onPhotoPickerDismissed();
+        SelectFileDialog.onPhotoPickerDismissed();
         recordFinalUmaStats(umaId);
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialogTest.java

@@ -34,6 +34,7 @@ import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.vr.VrModeProviderImpl;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
@@ -42,7 +43,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
 import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_public.browser.test.util.TouchCommon;
-import org.chromium.ui.PhotoPickerListener;
+import org.chromium.ui.base.PhotoPickerListener;
 import org.chromium.ui.test.util.DisableAnimationsTestRule;
 
 import java.io.File;
@@ -257,8 +258,9 @@ public class PhotoPickerDialogTest implements PhotoPickerListener, SelectionObse
                     @Override
                     public PhotoPickerDialog call() {
                         final PhotoPickerDialog dialog = new PhotoPickerDialog(
-                                mActivityTestRule.getActivity(), contentResolver,
-                                PhotoPickerDialogTest.this, multiselect, mimeTypes);
+                                mActivityTestRule.getActivity().getWindowAndroid(), contentResolver,
+                                PhotoPickerDialogTest.this, multiselect, mimeTypes,
+                                new VrModeProviderImpl());
                         dialog.show();
                         return dialog;
                     }

ui/android/BUILD.gn

@@ -207,7 +207,6 @@ android_library("ui_utils_java") {
   sources = [
     "java/src/org/chromium/ui/ContactsPickerListener.java",
     "java/src/org/chromium/ui/KeyboardVisibilityDelegate.java",
-    "java/src/org/chromium/ui/PhotoPickerListener.java",
     "java/src/org/chromium/ui/UiUtils.java",
   ]
   deps = [
@@ -255,6 +254,8 @@ android_library("ui_full_java") {
     "java/src/org/chromium/ui/base/IntentWindowAndroid.java",
     "java/src/org/chromium/ui/base/LocalizationUtils.java",
     "java/src/org/chromium/ui/base/PermissionCallback.java",
+    "java/src/org/chromium/ui/base/PhotoPickerDelegate.java",
+    "java/src/org/chromium/ui/base/PhotoPickerListener.java",
     "java/src/org/chromium/ui/base/ResourceBundle.java",
     "java/src/org/chromium/ui/base/SPenSupport.java",
     "java/src/org/chromium/ui/base/SelectFileDialog.java",

ui/android/java/src/org/chromium/ui/UiUtils.java

@@ -79,9 +79,6 @@ public class UiUtils {
     private UiUtils() {
     }
 
-    /** A delegate for the photo picker. */
-    private static PhotoPickerDelegate sPhotoPickerDelegate;
-
     /** A delegate for the contacts picker. */
     private static ContactsPickerDelegate sContactsPickerDelegate;
 
@@ -114,32 +111,6 @@ public class UiUtils {
         void onContactsPickerDismissed();
     }
 
-    /**
-     * A delegate interface for the photo picker.
-     */
-    public interface PhotoPickerDelegate {
-        /**
-         * Called to display the photo picker.
-         * @param context  The context to use.
-         * @param listener The listener that will be notified of the action the user took in the
-         *                 picker.
-         * @param allowMultiple Whether the dialog should allow multiple images to be selected.
-         * @param mimeTypes A list of mime types to show in the dialog.
-         */
-        void showPhotoPicker(Context context, PhotoPickerListener listener, boolean allowMultiple,
-                List<String> mimeTypes);
-
-        /**
-         * Called when the photo picker dialog has been dismissed.
-         */
-        void onPhotoPickerDismissed();
-
-        /**
-         * Returns whether video decoding support is supported in the photo picker.
-         */
-        boolean supportsVideos();
-    }
-
     // ContactsPickerDelegate:
 
     /**
@@ -180,55 +151,6 @@ public class UiUtils {
         sContactsPickerDelegate.onContactsPickerDismissed();
     }
 
-    // PhotoPickerDelegate:
-
-    /**
-     * Allows setting a delegate to override the default Android stock photo picker.
-     * @param delegate A {@link PhotoPickerDelegate} instance.
-     */
-    public static void setPhotoPickerDelegate(PhotoPickerDelegate delegate) {
-        sPhotoPickerDelegate = delegate;
-    }
-
-    /**
-     * Returns whether a photo picker should be called.
-     */
-    public static boolean shouldShowPhotoPicker() {
-        return sPhotoPickerDelegate != null;
-    }
-
-    /**
-     * Returns whether the photo picker supports showing videos.
-     */
-    public static boolean photoPickerSupportsVideo() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return false;
-        if (!shouldShowPhotoPicker()) return false;
-        return sPhotoPickerDelegate.supportsVideos();
-    }
-
-    /**
-     * Called to display the photo picker.
-     * @param context  The context to use.
-     * @param listener The listener that will be notified of the action the user took in the
-     *                 picker.
-     * @param allowMultiple Whether the dialog should allow multiple images to be selected.
-     * @param mimeTypes A list of mime types to show in the dialog.
-     */
-    public static boolean showPhotoPicker(Context context, PhotoPickerListener listener,
-            boolean allowMultiple, List<String> mimeTypes) {
-        if (sPhotoPickerDelegate == null) return false;
-        sPhotoPickerDelegate.showPhotoPicker(context, listener, allowMultiple, mimeTypes);
-        return true;
-    }
-
-    /**
-     * Called when the photo picker dialog has been dismissed.
-     */
-    public static void onPhotoPickerDismissed() {
-        if (sPhotoPickerDelegate == null) return;
-        sPhotoPickerDelegate.onPhotoPickerDismissed();
-    }
-
     /**
      * Gets the set of locales supported by the current enabled Input Methods.
      * @param context A {@link Context} instance.

ui/android/java/src/org/chromium/ui/base/PhotoPickerDelegate.java

+// Copyright 2020 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.
+
+package org.chromium.ui.base;
+
+import java.util.List;
+
+/** A delegate interface for the photo picker. */
+public interface PhotoPickerDelegate {
+    /**
+     * Called to display the photo picker.
+     * @param windowAndroid The window of the Activity.
+     * @param listener The listener that will be notified of the action the user took in the
+     *                 picker.
+     * @param allowMultiple Whether the dialog should allow multiple images to be selected.
+     * @param mimeTypes A list of mime types to show in the dialog.
+     */
+    void showPhotoPicker(WindowAndroid windowAndroid, PhotoPickerListener listener,
+            boolean allowMultiple, List<String> mimeTypes);
+
+    /**
+     * Called when the photo picker dialog has been dismissed.
+     */
+    void onPhotoPickerDismissed();
+
+    /**
+     * Returns whether video decoding support is supported in the photo picker.
+     */
+    boolean supportsVideos();
+}

ui/android/java/src/org/chromium/ui/PhotoPickerListener.java → ui/android/java/src/org/chromium/ui/base/PhotoPickerListener.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.net.Uri;
 

ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java

@@ -34,7 +34,6 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
-import org.chromium.ui.PhotoPickerListener;
 import org.chromium.ui.R;
 import org.chromium.ui.UiUtils;
 
@@ -113,6 +112,25 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
     /** Whether an Activity is available to capture audio. */
     private boolean mSupportsAudioCapture;
 
+    /** A delegate for the photo picker. */
+    private static PhotoPickerDelegate sPhotoPickerDelegate;
+
+    /**
+     * Allows setting a delegate to override the default Android stock photo picker.
+     * @param delegate A {@link PhotoPickerDelegate} instance.
+     */
+    public static void setPhotoPickerDelegate(PhotoPickerDelegate delegate) {
+        sPhotoPickerDelegate = delegate;
+    }
+
+    /**
+     * Called when the photo picker dialog has been dismissed.
+     */
+    public static void onPhotoPickerDismissed() {
+        if (sPhotoPickerDelegate == null) return;
+        sPhotoPickerDelegate.onPhotoPickerDismissed();
+    }
+
     SelectFileDialog(long nativeSelectFileDialog) {
         mNativeSelectFileDialog = nativeSelectFileDialog;
     }
@@ -261,12 +279,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
             if (mWindowAndroid.showIntent(soundRecorder, this, R.string.low_memory_error)) return;
         }
 
-        Activity activity = mWindowAndroid.getActivity().get();
-
         // Use the new photo picker, if available.
         List<String> imageMimeTypes = convertToSupportedPhotoPickerTypes(mFileTypes);
         if (shouldUsePhotoPicker()
-                && UiUtils.showPhotoPicker(activity, this, mAllowMultiple, imageMimeTypes)) {
+                && showPhotoPicker(mWindowAndroid, this, mAllowMultiple, imageMimeTypes)) {
             return;
         }
 
@@ -327,7 +343,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
      */
     private boolean shouldUsePhotoPicker() {
         List<String> mediaMimeTypes = convertToSupportedPhotoPickerTypes(mFileTypes);
-        return !captureImage() && mediaMimeTypes != null && UiUtils.shouldShowPhotoPicker()
+        return !captureImage() && mediaMimeTypes != null && shouldShowPhotoPicker()
                 && mWindowAndroid.getActivity().get() != null;
     }
 
@@ -345,7 +361,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         for (String type : fileTypes) {
             String mimeType = ensureMimeType(type);
             if (!mimeType.startsWith("image/")) {
-                if (!UiUtils.photoPickerSupportsVideo() || !mimeType.startsWith("video/")) {
+                if (!photoPickerSupportsVideo() || !mimeType.startsWith("video/")) {
                     return null;
                 }
             }
@@ -828,6 +844,23 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         RecordHistogram.recordCount100Histogram("Android.SelectFileDialogImgCount", count);
     }
 
+    private static boolean shouldShowPhotoPicker() {
+        return sPhotoPickerDelegate != null;
+    }
+
+    private static boolean photoPickerSupportsVideo() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return false;
+        if (!shouldShowPhotoPicker()) return false;
+        return sPhotoPickerDelegate.supportsVideos();
+    }
+
+    private static boolean showPhotoPicker(WindowAndroid windowAndroid,
+            PhotoPickerListener listener, boolean allowMultiple, List<String> mimeTypes) {
+        if (sPhotoPickerDelegate == null) return false;
+        sPhotoPickerDelegate.showPhotoPicker(windowAndroid, listener, allowMultiple, mimeTypes);
+        return true;
+    }
+
     @VisibleForTesting
     @CalledByNative
     static SelectFileDialog create(long nativeSelectFileDialog) {