| Index: chrome/browser/media_galleries/imported_media_gallery_registry.h
|
| diff --git a/chrome/browser/media_galleries/imported_media_gallery_registry.h b/chrome/browser/media_galleries/imported_media_gallery_registry.h
|
| index 9e7e2a2734276d4019780ceff3900f7a8cfcd5a5..3b1d12e2acb09692f2cf0e097b57c4b0486cf8ba 100644
|
| --- a/chrome/browser/media_galleries/imported_media_gallery_registry.h
|
| +++ b/chrome/browser/media_galleries/imported_media_gallery_registry.h
|
| @@ -38,16 +38,21 @@ class ImportedMediaGalleryRegistry {
|
| static ImportedMediaGalleryRegistry* GetInstance();
|
|
|
| // Should be called on the UI thread only.
|
| - std::string RegisterPicasaFilesystemOnUIThread(
|
| - const base::FilePath& database_path);
|
| + bool RegisterPicasaFilesystemOnUIThread(const std::string& fs_name,
|
| + const base::FilePath& database_path);
|
|
|
| - std::string RegisterITunesFilesystemOnUIThread(
|
| + bool RegisterITunesFilesystemOnUIThread(
|
| + const std::string& fs_name,
|
| const base::FilePath& xml_library_path);
|
|
|
| - std::string RegisterIPhotoFilesystemOnUIThread(
|
| + bool RegisterIPhotoFilesystemOnUIThread(
|
| + const std::string& fs_name,
|
| const base::FilePath& xml_library_path);
|
|
|
| - bool RevokeImportedFilesystemOnUIThread(const std::string& fsid);
|
| + bool RevokeImportedFilesystemOnUIThread(const std::string& fs_name);
|
| +
|
| + // Path where all virtual file systems are "mounted."
|
| + base::FilePath ImportedRoot();
|
|
|
| // Should be called on the MediaTaskRunner thread only.
|
| #if defined(OS_WIN) || defined(OS_MACOSX)
|
| @@ -81,14 +86,16 @@ 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_fsids_;
|
| - std::set<std::string> itunes_fsids_;
|
| + std::set<std::string> picasa_fs_names_;
|
| + std::set<std::string> itunes_fs_names_;
|
|
|
| #ifndef NDEBUG
|
| base::FilePath picasa_database_path_;
|
| @@ -99,7 +106,7 @@ class ImportedMediaGalleryRegistry {
|
| #if defined(OS_MACOSX)
|
| scoped_ptr<iphoto::IPhotoDataProvider> iphoto_data_provider_;
|
|
|
| - std::set<std::string> iphoto_fsids_;
|
| + std::set<std::string> iphoto_fs_names_;
|
|
|
| #ifndef NDEBUG
|
| base::FilePath iphoto_xml_library_path_;
|
|
|