Chromium Code Reviews| Index: chrome/browser/media_galleries/media_file_system_registry.cc |
| diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc |
| index 42ecc918809c726959db87beab5a627d66ddf5ef..581aa6750369ea1ef0a6d2ffab45f7c93f203f53 100644 |
| --- a/chrome/browser/media_galleries/media_file_system_registry.cc |
| +++ b/chrome/browser/media_galleries/media_file_system_registry.cc |
| @@ -562,9 +562,13 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl |
| std::string fsid; |
| if (StorageInfo::IsITunesDevice(device_id)) { |
| - NOTIMPLEMENTED(); |
| + ImportedMediaGalleryRegistry* imported_registry = |
| + ImportedMediaGalleryRegistry::GetInstance(); |
| + fsid = imported_registry->RegisterITunesFilesystemOnUIThread(path); |
| } else if (StorageInfo::IsPicasaDevice(device_id)) { |
| - fsid = ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread( |
| + ImportedMediaGalleryRegistry* imported_registry = |
| + ImportedMediaGalleryRegistry::GetInstance(); |
| + fsid = imported_registry->RegisterPicasaFilesystemOnUIThread( |
| path); |
| } else { |
| fsid = IsolatedContext::GetInstance()->RegisterFileSystemForPath( |
| @@ -594,6 +598,11 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl |
| } |
| virtual void RevokeFileSystem(const std::string& fsid) OVERRIDE { |
| + ImportedMediaGalleryRegistry* imported_registry = |
| + ImportedMediaGalleryRegistry::GetInstance(); |
| + if (imported_registry->RevokeImportedFilesystemOnUIThread(fsid)) |
| + return; |
| + |
| IsolatedContext::GetInstance()->RevokeFileSystem(fsid); |
|
vandebo (ex-Chrome)
2013/06/05 22:49:32
This was a bug, we never tried to unregister picas
|
| } |