Implement the new Photo picker, part two.

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

 // Copyright 2016 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.chrome.browser.init;
 
 import android.app.Activity;
 import android.content.Context;
 import android.view.View;
 
@@ skipping 13 matching lines @@
 import org.chromium.chrome.browser.DevToolsServer;
 import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.download.DownloadController;
 import org.chromium.chrome.browser.download.DownloadManagerService;
 import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+import org.chromium.chrome.browser.photo_picker.PhotoPickerDialog;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.rlz.RevenueStats;
 import org.chromium.chrome.browser.services.AccountsChangedReceiver;
 import org.chromium.chrome.browser.services.GoogleServicesManager;
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.printing.PrintDocumentAdapterWrapper;
 import org.chromium.printing.PrintingControllerImpl;
 import org.chromium.ui.PhotoPickerListener;
 import org.chromium.ui.UiUtils;
-import org.chromium.ui.widget.Toast;
 
 /**
  * Handles the initialization dependences of the browser process.  This is meant to handle the
  * initialization that is not tied to any particular Activity, and the logic that should only be
  * triggered a single time for the lifetime of the browser process.
  */
 public class ProcessInitializationHandler {
 
     private static final String SESSIONS_UUID_PREF_KEY = "chromium.sync.sessions.id";
     private static final String DEV_TOOLS_SERVER_SOCKET_PREFIX = "chrome";
 
     private static ProcessInitializationHandler sInstance;
 
     private boolean mInitializedPreNative;
     private boolean mInitializedPostNative;
     private boolean mInitializedDeferredStartupTasks;
     private DevToolsServer mDevToolsServer;
+    private PhotoPickerDialog mDialog;

[Ted C, 2017/04/06 23:52:15]

will this ever need to be used outside of the delegate?  If not, we should
probably just have this within the inner class.

[Finnur, 2017/04/07 13:52:20]

Done.

 
     /**
      * @return The ProcessInitializationHandler for use during the lifetime of the browser process.
      */
     public static ProcessInitializationHandler getInstance() {
         ThreadUtils.assertOnUiThread();
         if (sInstance == null) {
             sInstance = AppHooks.get().createProcessInitializationHandler();
         }
         return sInstance;
@@ skipping 82 matching lines @@
         AppBannerManager.setAppDetailsDelegate(AppHooks.get().createAppDetailsDelegate());
         ChromeLifetimeController.initialize();
 
         PrefServiceBridge.getInstance().migratePreferences(application);
 
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.NEW_PHOTO_PICKER)) {
             UiUtils.setPhotoPickerDelegate(new UiUtils.PhotoPickerDelegate() {
                 @Override
                 public void showPhotoPicker(
                         Context context, PhotoPickerListener listener, boolean allowMultiple) {
-                    Toast toast = Toast.makeText(context, "Not implemented!", Toast.LENGTH_SHORT);
-                    toast.show();
+                    mDialog = new PhotoPickerDialog(context, listener, allowMultiple);
+                    mDialog.show();
                 }
 
                 @Override
-                public void dismissPhotoPicker() {}
+                public void dismissPhotoPicker() {
+                    mDialog.dismiss();
+                    mDialog = null;
+                }
             });
         }
     }
 
     /**
      * Initializes the deferred startup tasks that should only be triggered once per browser process
      * lifetime.
      */
     public final void initializeDeferredStartupTasks() {
         ThreadUtils.assertOnUiThread();
@@ skipping 58 matching lines @@
 
                 if (ApiCompatibilityUtils.isPrintingSupported()) {
                     String errorText = application.getResources().getString(
                             R.string.error_printing_failed);
                     PrintingControllerImpl.create(new PrintDocumentAdapterWrapper(), errorText);
                 }
             }
         });
     }
 }