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 2b62f7e57ddfd3b0737f375dac5944f2a3e0c004..1ec395e37f9d0db7b52e50a167c77a444f0182ac 100644 |
--- a/chrome/browser/media_galleries/imported_media_gallery_registry.h |
+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.h |
@@ -5,6 +5,7 @@ |
#ifndef CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_ |
#define CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_ |
+#include <set> |
#include <string> |
#include "base/basictypes.h" |
@@ -12,6 +13,10 @@ |
#include "base/lazy_instance.h" |
#include "base/memory/scoped_ptr.h" |
+namespace itunes { |
+class ITunesDataProvider; |
+} |
+ |
namespace picasa { |
class PicasaDataProvider; |
} |
@@ -28,13 +33,19 @@ class ImportedMediaGalleryRegistry { |
static ImportedMediaGalleryRegistry* GetInstance(); |
// Should be called on the UI thread only. |
- static std::string RegisterPicasaFilesystemOnUIThread( |
+ std::string RegisterPicasaFilesystemOnUIThread( |
const base::FilePath& database_path); |
- static bool RevokePicasaFilesystemOnUIThread(const std::string& fsid); |
+ |
+ std::string RegisterITunesFilesystemOnUIThread( |
+ const base::FilePath& xml_library_path); |
+ |
+ bool RevokeImportedFilesystemOnUIThread(const std::string& fsid); |
// Should be called on the MediaTaskRunner thread only. |
static picasa::PicasaDataProvider* picasa_data_provider(); |
+ static itunes::ITunesDataProvider* itunes_data_provider(); |
+ |
private: |
friend struct base::DefaultLazyInstanceTraits<ImportedMediaGalleryRegistry>; |
@@ -44,9 +55,19 @@ class ImportedMediaGalleryRegistry { |
void RegisterPicasaFileSystem(const base::FilePath& database_path); |
void RevokePicasaFileSystem(); |
+ void RegisterITunesFileSystem(const base::FilePath& xml_library_path); |
+ void RevokeITunesFileSystem(); |
+ |
scoped_ptr<picasa::PicasaDataProvider> picasa_data_provider_; |
Lei Zhang
2013/06/06 03:48:47
You should mention which variables are accessed on
vandebo (ex-Chrome)
2013/06/06 19:49:18
Done.
|
+ std::set<std::string> picasa_fsids_; |
+ |
+ scoped_ptr<itunes::ITunesDataProvider> itunes_data_provider_; |
+ std::set<std::string> itunes_fsids_; |
- int picasa_filesystems_count_; |
+#ifndef NDEBUG |
+ std::string picasa_database_path_; |
Lei Zhang
2013/06/06 03:48:47
These need to be FilePaths to compile x-platform.
vandebo (ex-Chrome)
2013/06/06 19:49:18
Done.
|
+ std::string itunes_xml_library_path_; |
+#endif |
DISALLOW_COPY_AND_ASSIGN(ImportedMediaGalleryRegistry); |
}; |