Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: chrome/browser/media_galleries/imported_media_gallery_registry.cc

Issue 2318133002: Remove call to IsRunningSequenceOnCurrentThread() in media_file_system_backend.cc (Closed)
Patch Set: Leaky LazyInstance Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 base::FilePath ImportedMediaGalleryRegistry::ImportedRoot() { 149 base::FilePath ImportedMediaGalleryRegistry::ImportedRoot() {
150 DCHECK(!imported_root_.empty()); 150 DCHECK(!imported_root_.empty());
151 return imported_root_; 151 return imported_root_;
152 } 152 }
153 153
154 #if defined(OS_WIN) || defined(OS_MACOSX) 154 #if defined(OS_WIN) || defined(OS_MACOSX)
155 // static 155 // static
156 picasa::PicasaDataProvider* 156 picasa::PicasaDataProvider*
157 ImportedMediaGalleryRegistry::PicasaDataProvider() { 157 ImportedMediaGalleryRegistry::PicasaDataProvider() {
158 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 158 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
159 DCHECK(GetInstance()->picasa_data_provider_); 159 DCHECK(GetInstance()->picasa_data_provider_);
160 return GetInstance()->picasa_data_provider_.get(); 160 return GetInstance()->picasa_data_provider_.get();
161 } 161 }
162 162
163 // static 163 // static
164 itunes::ITunesDataProvider* 164 itunes::ITunesDataProvider*
165 ImportedMediaGalleryRegistry::ITunesDataProvider() { 165 ImportedMediaGalleryRegistry::ITunesDataProvider() {
166 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 166 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
167 DCHECK(GetInstance()->itunes_data_provider_); 167 DCHECK(GetInstance()->itunes_data_provider_);
168 return GetInstance()->itunes_data_provider_.get(); 168 return GetInstance()->itunes_data_provider_.get();
169 } 169 }
170 #endif // defined(OS_WIN) || defined(OS_MACOSX) 170 #endif // defined(OS_WIN) || defined(OS_MACOSX)
171 171
172 ImportedMediaGalleryRegistry::ImportedMediaGalleryRegistry() {} 172 ImportedMediaGalleryRegistry::ImportedMediaGalleryRegistry() {}
173 173
174 ImportedMediaGalleryRegistry::~ImportedMediaGalleryRegistry() { 174 ImportedMediaGalleryRegistry::~ImportedMediaGalleryRegistry() {
175 if (!imported_root_.empty()) 175 if (!imported_root_.empty())
176 base::DeleteFile(imported_root_, false); 176 base::DeleteFile(imported_root_, false);
177 #if defined(OS_WIN) || defined(OS_MACOSX) 177 #if defined(OS_WIN) || defined(OS_MACOSX)
178 DCHECK_EQ(0U, picasa_fs_names_.size()); 178 DCHECK_EQ(0U, picasa_fs_names_.size());
179 DCHECK_EQ(0U, itunes_fs_names_.size()); 179 DCHECK_EQ(0U, itunes_fs_names_.size());
180 #endif // defined(OS_WIN) || defined(OS_MACOSX) 180 #endif // defined(OS_WIN) || defined(OS_MACOSX)
181 } 181 }
182 182
183 #if defined(OS_WIN) || defined(OS_MACOSX) 183 #if defined(OS_WIN) || defined(OS_MACOSX)
184 void ImportedMediaGalleryRegistry::RegisterPicasaFileSystem( 184 void ImportedMediaGalleryRegistry::RegisterPicasaFileSystem(
185 const base::FilePath& database_path) { 185 const base::FilePath& database_path) {
186 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 186 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
187 DCHECK(!picasa_data_provider_); 187 DCHECK(!picasa_data_provider_);
188 picasa_data_provider_.reset(new picasa::PicasaDataProvider(database_path)); 188 picasa_data_provider_.reset(new picasa::PicasaDataProvider(database_path));
189 } 189 }
190 190
191 void ImportedMediaGalleryRegistry::RevokePicasaFileSystem() { 191 void ImportedMediaGalleryRegistry::RevokePicasaFileSystem() {
192 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 192 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
193 DCHECK(picasa_data_provider_); 193 DCHECK(picasa_data_provider_);
194 picasa_data_provider_.reset(); 194 picasa_data_provider_.reset();
195 } 195 }
196 196
197 void ImportedMediaGalleryRegistry::RegisterITunesFileSystem( 197 void ImportedMediaGalleryRegistry::RegisterITunesFileSystem(
198 const base::FilePath& xml_library_path) { 198 const base::FilePath& xml_library_path) {
199 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 199 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
200 DCHECK(!itunes_data_provider_); 200 DCHECK(!itunes_data_provider_);
201 itunes_data_provider_.reset(new itunes::ITunesDataProvider(xml_library_path)); 201 itunes_data_provider_.reset(new itunes::ITunesDataProvider(xml_library_path));
202 } 202 }
203 203
204 void ImportedMediaGalleryRegistry::RevokeITunesFileSystem() { 204 void ImportedMediaGalleryRegistry::RevokeITunesFileSystem() {
205 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread()); 205 MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
206 DCHECK(itunes_data_provider_); 206 DCHECK(itunes_data_provider_);
207 itunes_data_provider_.reset(); 207 itunes_data_provider_.reset();
208 } 208 }
209 #endif // defined(OS_WIN) || defined(OS_MACOSX) 209 #endif // defined(OS_WIN) || defined(OS_MACOSX)
210 210
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698