[Media Gallery] Add existing attached devices to the prefs in time for media galleries dialog.

chrome/browser/media_gallery/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_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
@@ skipping 72 matching lines @@
   // The instance is lazily created per browser process.
   static MediaFileSystemRegistry* GetInstance();
 
   // 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);
 
+  // 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.
+  MediaGalleriesPreferences* GetPreferences(Profile* profile);
+
   // base::SystemMonitor::DevicesChangedObserver implementation.
   virtual void OnRemovableStorageAttached(
       const std::string& id, const string16& name,
       const FilePath::StringType& location) OVERRIDE;
   virtual void OnRemovableStorageDetached(const std::string& id) OVERRIDE;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<MediaFileSystemRegistry>;
   class MediaFileSystemContextImpl;
 
@@ skipping 19 matching lines @@
   // Returns ScopedMtpDeviceMapEntry object for the given |device_location|.
   ScopedMtpDeviceMapEntry* GetOrCreateScopedMtpDeviceMapEntry(
       const FilePath::StringType& device_location);
 
   // Removes the ScopedMtpDeviceMapEntry associated with the given
   // |device_location|.
   void RemoveScopedMtpDeviceMapEntry(
       const FilePath::StringType& device_location);
 #endif
 
-  // Register all the media devices found in system monitor as auto-detected
-  // galleries for the passed |preferences|.
-  void AddAttachedMediaDeviceGalleries(MediaGalleriesPreferences* preferences);
-
   void OnExtensionGalleriesHostEmpty(Profile* profile,
                                      const std::string& extension_id);
 
   // Only accessed on the UI thread. This map owns all the
   // ExtensionGalleriesHost objects created.
   ExtensionGalleriesHostMap extension_hosts_map_;
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   // Only accessed on the UI thread.
   MTPDeviceDelegateMap mtp_delegate_map_;
 #endif
 
   scoped_ptr<MediaFileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_