[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/media_galleries/media_file_system_registry.h

 // Copyright (c) 2012 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.
 
 // MediaFileSystemRegistry registers pictures directories and media devices as
 // File API filesystems and keeps track of the path to filesystem ID mappings.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
@@ skipping 63 matching lines @@
   MediaFileSystemRegistry();
   virtual ~MediaFileSystemRegistry();
 
   // Passes to |callback| the list of media filesystem IDs and paths for a
   // given RVH. Called on the UI thread.
   void GetMediaFileSystemsForExtension(
       const content::RenderViewHost* rvh,
       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;
 
   size_t GetExtensionGalleriesHostCountForTests() const;
 
   // See TransientDeviceIds::GetTransientIdForDeviceId().
   uint64 GetTransientIdForDeviceId(const std::string& device_id);
 
  private:
   friend class TestMediaFileSystemContext;
@@ skipping 43 matching lines @@
 #endif
 
   scoped_ptr<MediaFileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_