Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / imported_media_gallery_registry.h

diff --git a/src/chrome/browser/media_galleries/imported_media_gallery_registry.h b/src/chrome/browser/media_galleries/imported_media_gallery_registry.h
index 8c343c1..9e7e2a2 100644 (file)
--- a/src/chrome/browser/media_galleries/imported_media_gallery_registry.h
+++ b/src/chrome/browser/media_galleries/imported_media_gallery_registry.h
@@ -37,24 +37,17 @@ class ImportedMediaGalleryRegistry {
  public:
   static ImportedMediaGalleryRegistry* GetInstance();
 
-  void Initialize();
-
   // Should be called on the UI thread only.
-  bool RegisterPicasaFilesystemOnUIThread(const std::string& fs_name,
-                                          const base::FilePath& database_path);
+  std::string RegisterPicasaFilesystemOnUIThread(
+      const base::FilePath& database_path);
 
-  bool RegisterITunesFilesystemOnUIThread(
-      const std::string& fs_name,
+  std::string RegisterITunesFilesystemOnUIThread(
       const base::FilePath& xml_library_path);
 
-  bool RegisterIPhotoFilesystemOnUIThread(
-      const std::string& fs_name,
+  std::string RegisterIPhotoFilesystemOnUIThread(
       const base::FilePath& xml_library_path);
 
-  bool RevokeImportedFilesystemOnUIThread(const std::string& fs_name);
-
-  // Path where all virtual file systems are "mounted."
-  base::FilePath ImportedRoot();
+  bool RevokeImportedFilesystemOnUIThread(const std::string& fsid);
 
   // Should be called on the MediaTaskRunner thread only.
 #if defined(OS_WIN) || defined(OS_MACOSX)
@@ -88,16 +81,14 @@ class ImportedMediaGalleryRegistry {
   void RevokeIPhotoFileSystem();
 #endif  // defined(OS_MACOSX)
 
-  base::FilePath imported_root_;
-
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // The data providers are only set or accessed on the task runner thread.
   scoped_ptr<picasa::PicasaDataProvider> picasa_data_provider_;
   scoped_ptr<itunes::ITunesDataProvider> itunes_data_provider_;
 
   // The remaining members are only accessed on the IO thread.
-  std::set<std::string> picasa_fs_names_;
-  std::set<std::string> itunes_fs_names_;
+  std::set<std::string> picasa_fsids_;
+  std::set<std::string> itunes_fsids_;
 
 #ifndef NDEBUG
   base::FilePath picasa_database_path_;
@@ -108,7 +99,7 @@ class ImportedMediaGalleryRegistry {
 #if defined(OS_MACOSX)
   scoped_ptr<iphoto::IPhotoDataProvider> iphoto_data_provider_;
 
-  std::set<std::string> iphoto_fs_names_;
+  std::set<std::string> iphoto_fsids_;
 
 #ifndef NDEBUG
   base::FilePath iphoto_xml_library_path_;