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/logging.h" | 8 #include "base/logging.h" |
9 #include "base/threading/sequenced_worker_pool.h" | 9 #include "base/threading/sequenced_worker_pool.h" |
10 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h" | 10 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h" |
| 11 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p
rovider.h" |
11 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" | 12 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" |
12 #include "chrome/common/extensions/extension_constants.h" | 13 #include "chrome/common/extensions/extension_constants.h" |
13 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
14 #include "webkit/browser/fileapi/file_system_task_runners.h" | |
15 #include "webkit/browser/fileapi/isolated_context.h" | 15 #include "webkit/browser/fileapi/isolated_context.h" |
16 | 16 |
17 using base::Bind; | 17 using base::Bind; |
18 | 18 |
19 namespace chrome { | 19 namespace chrome { |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 bool CurrentlyOnMediaTaskRunnerThread() { | 23 bool CurrentlyOnMediaTaskRunnerThread() { |
24 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 24 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
25 base::SequencedWorkerPool::SequenceToken media_sequence_token = | 25 base::SequencedWorkerPool::SequenceToken media_sequence_token = |
26 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); | 26 pool->GetNamedSequenceToken( |
| 27 MediaFileSystemMountPointProvider::kMediaTaskRunnerName); |
27 | 28 |
28 return pool->IsRunningSequenceOnCurrentThread(media_sequence_token); | 29 return pool->IsRunningSequenceOnCurrentThread(media_sequence_token); |
29 } | 30 } |
30 | 31 |
31 scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() { | 32 scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() { |
32 DCHECK(!CurrentlyOnMediaTaskRunnerThread()); | 33 DCHECK(!CurrentlyOnMediaTaskRunnerThread()); |
33 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 34 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
34 base::SequencedWorkerPool::SequenceToken media_sequence_token = | 35 base::SequencedWorkerPool::SequenceToken media_sequence_token = |
35 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); | 36 pool->GetNamedSequenceToken( |
| 37 MediaFileSystemMountPointProvider::kMediaTaskRunnerName); |
36 | 38 |
37 return pool->GetSequencedTaskRunner(media_sequence_token); | 39 return pool->GetSequencedTaskRunner(media_sequence_token); |
38 } | 40 } |
39 | 41 |
40 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky | 42 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky |
41 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; | 43 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; |
42 | 44 |
43 } | 45 } // namespace |
44 | 46 |
45 // static | 47 // static |
46 ImportedMediaGalleryRegistry* ImportedMediaGalleryRegistry::GetInstance() { | 48 ImportedMediaGalleryRegistry* ImportedMediaGalleryRegistry::GetInstance() { |
47 return g_imported_media_gallery_registry.Pointer(); | 49 return g_imported_media_gallery_registry.Pointer(); |
48 } | 50 } |
49 | 51 |
50 std::string ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread( | 52 std::string ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread( |
51 const base::FilePath& database_path) { | 53 const base::FilePath& database_path) { |
52 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 54 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
53 DCHECK(!database_path.empty()); | 55 DCHECK(!database_path.empty()); |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 itunes_data_provider_.reset(new itunes::ITunesDataProvider(xml_library_path)); | 181 itunes_data_provider_.reset(new itunes::ITunesDataProvider(xml_library_path)); |
180 } | 182 } |
181 | 183 |
182 void ImportedMediaGalleryRegistry::RevokeITunesFileSystem() { | 184 void ImportedMediaGalleryRegistry::RevokeITunesFileSystem() { |
183 DCHECK(CurrentlyOnMediaTaskRunnerThread()); | 185 DCHECK(CurrentlyOnMediaTaskRunnerThread()); |
184 DCHECK(itunes_data_provider_); | 186 DCHECK(itunes_data_provider_); |
185 itunes_data_provider_.reset(); | 187 itunes_data_provider_.reset(); |
186 } | 188 } |
187 | 189 |
188 } // namespace chrome | 190 } // namespace chrome |
OLD | NEW |