[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/media_galleries/media_file_system_registry.h

Index: chrome/browser/media_galleries/media_file_system_registry.h
diff --git a/chrome/browser/media_galleries/media_file_system_registry.h b/chrome/browser/media_galleries/media_file_system_registry.h
index 6843c3a0f87826bfbae243f8c4512987ddb54626..ac8bd26ba6eb6a53627713d4546a8ee471564d29 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.h
+++ b/chrome/browser/media_galleries/media_file_system_registry.h
@@ -81,13 +81,33 @@ class MediaFileSystemRegistry : public RemovableStorageObserver {
       const extensions::Extension* extension,
       const MediaFileSystemsCallback& callback);
 
+  // Bottom half of |GetMediaFileSystemsForExtensions|, called after we

[Lei Zhang, 2013/05/10 05:24:43]

nit: drop the we.

[Greg Billock, 2013/05/10 16:20:27]

Done.

+  // make sure that the StorageMonitor is initialized.
+  void GetMediaFileSystemsPostStorageMonitorInit(

[Lei Zhang, 2013/05/10 05:24:43]

Also private.

[Greg Billock, 2013/05/10 16:20:27]

Done.

+      const content::RenderViewHost* rvh,
+      const extensions::Extension* extension,
+      const MediaFileSystemsCallback& callback,
+      MediaGalleriesPreferences* preferences);
+
   // Returns the initialized media galleries preferences for the specified
   // |profile|. This method should be used instead of calling
   // MediaGalleriesPreferences directly because this method also ensures that
   // currently attached removable devices are added to the preferences.
-  // Called on the UI thread.
+  // Called on the UI thread. Do not call from outside this class.
   MediaGalleriesPreferences* GetPreferences(Profile* profile);
 
+  // Notify the registry when the storage monitor has been initialized.
+  void OnStorageMonitorInitialized(

[Lei Zhang, 2013/05/10 05:24:43]

also private.

[Greg Billock, 2013/05/10 16:20:27]

Done.

+      Profile* profile,
+      base::Callback<void(MediaGalleriesPreferences*)> callback);
+
+  // Call the given callback with preferences. This is asynchronous so that
+  // StorageMonitor may be initialized lazily in order to set up the returned
+  // preferences.
+  void GetPreferencesAsync(
+      Profile* profile,
+      base::Callback<void(MediaGalleriesPreferences*)> callback);
+
   // RemovableStorageObserver implementation.
   virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;