Photo Picker dialog: Simplify and consolidate the dialog dismiss path…

… & UMA.

This should also fix a crash seen.

Bug: 758605
Change-Id: I50030c86ee3cdc1b5ca1b25163336a72fd973f0a
Reviewed-on: https://chromium-review.googlesource.com/668398
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502253}

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

@@ -229,8 +229,7 @@ public void showPhotoPicker(Context context, PhotoPickerListener listener,
                 }
 
                 @Override
-                public void dismissPhotoPicker() {
-                    mDialog.dismiss();
+                public void onPhotoPickerDismissed() {
                     mDialog = null;
                 }
             });

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

@@ -27,6 +27,7 @@
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.ui.PhotoPickerListener;
+import org.chromium.ui.UiUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -210,8 +211,7 @@ public void initialize(PhotoPickerDialog dialog, PhotoPickerListener listener,
         mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
             public void onCancel(DialogInterface dialog) {
-                recordFinalUmaStats(ACTION_CANCEL);
-                mListener.onPickerUserAction(PhotoPickerListener.Action.CANCEL, null);
+                executeAction(PhotoPickerListener.Action.CANCEL, null, ACTION_CANCEL);
             }
         });
     }
@@ -257,14 +257,10 @@ public void onViewRecycled(RecyclerView.ViewHolder holder) {
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.done) {
-            recordFinalUmaStats(ACTION_PHOTO_PICKED);
             notifyPhotosSelected();
         } else {
-            recordFinalUmaStats(ACTION_CANCEL);
-            mListener.onPickerUserAction(PhotoPickerListener.Action.CANCEL, null);
+            executeAction(PhotoPickerListener.Action.CANCEL, null, ACTION_CANCEL);
         }
-
-        mDialog.dismiss();
     }
 
     /**
@@ -319,16 +315,14 @@ public boolean isMultiSelectAllowed() {
      * Notifies the listener that the user selected to launch the gallery.
      */
     public void showGallery() {
-        recordFinalUmaStats(ACTION_BROWSE);
-        mListener.onPickerUserAction(PhotoPickerListener.Action.LAUNCH_GALLERY, null);
+        executeAction(PhotoPickerListener.Action.LAUNCH_GALLERY, null, ACTION_BROWSE);
     }
 
     /**
      * Notifies the listener that the user selected to launch the camera intent.
      */
     public void showCamera() {
-        recordFinalUmaStats(ACTION_NEW_PHOTO);
-        mListener.onPickerUserAction(PhotoPickerListener.Action.LAUNCH_CAMERA, null);
+        executeAction(PhotoPickerListener.Action.LAUNCH_CAMERA, null, ACTION_NEW_PHOTO);
     }
 
     /**
@@ -381,7 +375,7 @@ private void notifyPhotosSelected() {
             photos[i++] = bitmap.getFilePath();
         }
 
-        mListener.onPickerUserAction(PhotoPickerListener.Action.PHOTOS_SELECTED, photos);
+        executeAction(PhotoPickerListener.Action.PHOTOS_SELECTED, photos, ACTION_PHOTO_PICKED);
     }
 
     /**
@@ -421,6 +415,19 @@ public void getItemOffsets(
         }
     }
 
+    /**
+     * Report back what the user selected in the dialog, report UMA and clean up.
+     * @param action The action taken.
+     * @param photos The photos that were selected (if any).
+     * @param umaId The UMA value to record with the action.
+     */
+    private void executeAction(PhotoPickerListener.Action action, String[] photos, int umaId) {
+        mListener.onPickerUserAction(action, photos);
+        mDialog.dismiss();
+        UiUtils.onPhotoPickerDismissed();
+        recordFinalUmaStats(umaId);
+    }
+
     /**
      * Record UMA statistics (what action was taken in the dialog and other performance stats).
      * @param action The action the user took in the dialog.

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

@@ -93,9 +93,9 @@ void showPhotoPicker(Context context, PhotoPickerListener listener, boolean allo
                 List<String> mimeTypes);
 
         /**
-         * Called when the photo picker dialog should be dismissed.
+         * Called when the photo picker dialog has been dismissed.
          */
-        void dismissPhotoPicker();
+        void onPhotoPickerDismissed();
     }
 
     // PhotoPickerDelegate:
@@ -131,11 +131,11 @@ public static boolean showPhotoPicker(Context context, PhotoPickerListener liste
     }
 
     /**
-     * Called when the photo picker dialog should be dismissed.
+     * Called when the photo picker dialog has been dismissed.
      */
-    public static void dismissPhotoPicker() {
+    public static void onPhotoPickerDismissed() {
         if (sPhotoPickerDelegate == null) return;
-        sPhotoPickerDelegate.dismissPhotoPicker();
+        sPhotoPickerDelegate.onPhotoPickerDismissed();
     }
 
     // KeyboardShowingDelegate:

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

@@ -318,8 +318,6 @@ public static String ensureMimeType(String type) {
 
     @Override
     public void onPickerUserAction(Action action, String[] photos) {
-        UiUtils.dismissPhotoPicker();
-
         switch (action) {
             case CANCEL:
                 onFileNotSelected();