| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h" | 5 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h" | 10 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h" |
| 11 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h" | 11 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h" |
| 12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" | 12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" |
| 13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" | 13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h" |
| 14 #include "chrome/common/extensions/extension_constants.h" | 14 #include "chrome/common/extensions/extension_constants.h" |
| 15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
| 16 #include "storage/browser/fileapi/external_mount_points.h" |
| 16 #include "storage/common/fileapi/file_system_mount_option.h" | 17 #include "storage/common/fileapi/file_system_mount_option.h" |
| 17 #include "webkit/browser/fileapi/external_mount_points.h" | |
| 18 | 18 |
| 19 using base::Bind; | 19 using base::Bind; |
| 20 using storage::ExternalMountPoints; | 20 using storage::ExternalMountPoints; |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky | 24 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky |
| 25 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; | 25 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; |
| 26 | 26 |
| 27 } // namespace | 27 } // namespace |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 DCHECK(!iphoto_data_provider_); | 279 DCHECK(!iphoto_data_provider_); |
| 280 iphoto_data_provider_.reset(new iphoto::IPhotoDataProvider(xml_library_path)); | 280 iphoto_data_provider_.reset(new iphoto::IPhotoDataProvider(xml_library_path)); |
| 281 } | 281 } |
| 282 | 282 |
| 283 void ImportedMediaGalleryRegistry::RevokeIPhotoFileSystem() { | 283 void ImportedMediaGalleryRegistry::RevokeIPhotoFileSystem() { |
| 284 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); | 284 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); |
| 285 DCHECK(iphoto_data_provider_); | 285 DCHECK(iphoto_data_provider_); |
| 286 iphoto_data_provider_.reset(); | 286 iphoto_data_provider_.reset(); |
| 287 } | 287 } |
| 288 #endif // defined(OS_MACOSX) | 288 #endif // defined(OS_MACOSX) |
| OLD | NEW |