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/media_file_system_mount_point_p
rovider.h" |
10 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" | 11 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h" |
11 #include "chrome/common/extensions/extension_constants.h" | 12 #include "chrome/common/extensions/extension_constants.h" |
12 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
13 #include "webkit/browser/fileapi/file_system_task_runners.h" | |
14 #include "webkit/browser/fileapi/isolated_context.h" | 14 #include "webkit/browser/fileapi/isolated_context.h" |
15 | 15 |
16 using base::Bind; | 16 using base::Bind; |
17 | 17 |
18 namespace chrome { | 18 namespace chrome { |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
22 bool CurrentlyOnMediaTaskRunnerThread() { | 22 bool CurrentlyOnMediaTaskRunnerThread() { |
23 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 23 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
24 base::SequencedWorkerPool::SequenceToken media_sequence_token = | 24 base::SequencedWorkerPool::SequenceToken media_sequence_token = |
25 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); | 25 pool->GetNamedSequenceToken( |
| 26 MediaFileSystemMountPointProvider::kMediaTaskRunnerName); |
26 | 27 |
27 return pool->IsRunningSequenceOnCurrentThread(media_sequence_token); | 28 return pool->IsRunningSequenceOnCurrentThread(media_sequence_token); |
28 } | 29 } |
29 | 30 |
30 scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() { | 31 scoped_refptr<base::SequencedTaskRunner> MediaTaskRunner() { |
31 DCHECK(!CurrentlyOnMediaTaskRunnerThread()); | 32 DCHECK(!CurrentlyOnMediaTaskRunnerThread()); |
32 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 33 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
33 base::SequencedWorkerPool::SequenceToken media_sequence_token = | 34 base::SequencedWorkerPool::SequenceToken media_sequence_token = |
34 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); | 35 pool->GetNamedSequenceToken( |
| 36 MediaFileSystemMountPointProvider::kMediaTaskRunnerName); |
35 | 37 |
36 return pool->GetSequencedTaskRunner(media_sequence_token); | 38 return pool->GetSequencedTaskRunner(media_sequence_token); |
37 } | 39 } |
38 | 40 |
39 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky | 41 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky |
40 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; | 42 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER; |
41 | 43 |
42 } | 44 } |
43 | 45 |
44 // static | 46 // static |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 void ImportedMediaGalleryRegistry::RevokePicasaFileSystem() { | 115 void ImportedMediaGalleryRegistry::RevokePicasaFileSystem() { |
114 DCHECK(CurrentlyOnMediaTaskRunnerThread()); | 116 DCHECK(CurrentlyOnMediaTaskRunnerThread()); |
115 | 117 |
116 if (--picasa_filesystems_count_ == 0) { | 118 if (--picasa_filesystems_count_ == 0) { |
117 DCHECK(picasa_data_provider_); | 119 DCHECK(picasa_data_provider_); |
118 picasa_data_provider_.reset(NULL); | 120 picasa_data_provider_.reset(NULL); |
119 } | 121 } |
120 } | 122 } |
121 | 123 |
122 } // namespace chrome | 124 } // namespace chrome |
OLD | NEW |