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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 18344013: fileapi: Rename FileSystemMountProvider to FileSystemBackend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #include "webkit/plugins/plugin_switches.h" 141 #include "webkit/plugins/plugin_switches.h"
142 142
143 #if defined(OS_WIN) 143 #if defined(OS_WIN)
144 #include "chrome/browser/chrome_browser_main_win.h" 144 #include "chrome/browser/chrome_browser_main_win.h"
145 #include "sandbox/win/src/sandbox_policy.h" 145 #include "sandbox/win/src/sandbox_policy.h"
146 #elif defined(OS_MACOSX) 146 #elif defined(OS_MACOSX)
147 #include "chrome/browser/chrome_browser_main_mac.h" 147 #include "chrome/browser/chrome_browser_main_mac.h"
148 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 148 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
149 #elif defined(OS_CHROMEOS) 149 #elif defined(OS_CHROMEOS)
150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 150 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
151 #include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h" 151 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
152 #include "chrome/browser/chromeos/login/startup_utils.h" 152 #include "chrome/browser/chromeos/login/startup_utils.h"
153 #include "chrome/browser/chromeos/login/user_manager.h" 153 #include "chrome/browser/chromeos/login/user_manager.h"
154 #include "chrome/browser/chromeos/system/statistics_provider.h" 154 #include "chrome/browser/chromeos/system/statistics_provider.h"
155 #include "chromeos/chromeos_switches.h" 155 #include "chromeos/chromeos_switches.h"
156 #elif defined(OS_LINUX) 156 #elif defined(OS_LINUX)
157 #include "chrome/browser/chrome_browser_main_linux.h" 157 #include "chrome/browser/chrome_browser_main_linux.h"
158 #elif defined(OS_ANDROID) 158 #elif defined(OS_ANDROID)
159 #include "chrome/browser/android/crash_dump_manager.h" 159 #include "chrome/browser/android/crash_dump_manager.h"
160 #include "chrome/browser/chrome_browser_main_android.h" 160 #include "chrome/browser/chrome_browser_main_android.h"
161 #include "chrome/common/descriptors_android.h" 161 #include "chrome/common/descriptors_android.h"
(...skipping 17 matching lines...) Expand all
179 #if defined(USE_NSS) 179 #if defined(USE_NSS)
180 #include "chrome/browser/ui/crypto_module_password_dialog.h" 180 #include "chrome/browser/ui/crypto_module_password_dialog.h"
181 #endif 181 #endif
182 182
183 #if !defined(OS_CHROMEOS) 183 #if !defined(OS_CHROMEOS)
184 #include "chrome/browser/signin/signin_manager.h" 184 #include "chrome/browser/signin/signin_manager.h"
185 #include "chrome/browser/signin/signin_manager_factory.h" 185 #include "chrome/browser/signin/signin_manager_factory.h"
186 #endif 186 #endif
187 187
188 #if !defined(OS_ANDROID) 188 #if !defined(OS_ANDROID)
189 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h" 189 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
190 #endif 190 #endif
191 191
192 #if defined(ENABLE_WEBRTC) 192 #if defined(ENABLE_WEBRTC)
193 #include "chrome/browser/media/webrtc_logging_handler_host.h" 193 #include "chrome/browser/media/webrtc_logging_handler_host.h"
194 #endif 194 #endif
195 195
196 #if defined(FILE_MANAGER_EXTENSION) 196 #if defined(FILE_MANAGER_EXTENSION)
197 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" 197 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
198 #endif 198 #endif
199 199
(...skipping 2089 matching lines...) Expand 10 before | Expand all | Expand 10 after
2289 } 2289 }
2290 2290
2291 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2291 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2292 std::vector<std::string>* additional_allowed_schemes) { 2292 std::vector<std::string>* additional_allowed_schemes) {
2293 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2293 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2294 additional_allowed_schemes); 2294 additional_allowed_schemes);
2295 additional_allowed_schemes->push_back(kChromeUIScheme); 2295 additional_allowed_schemes->push_back(kChromeUIScheme);
2296 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2296 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2297 } 2297 }
2298 2298
2299 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( 2299 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2300 const base::FilePath& storage_partition_path, 2300 const base::FilePath& storage_partition_path,
2301 quota::SpecialStoragePolicy* special_storage_policy, 2301 quota::SpecialStoragePolicy* special_storage_policy,
2302 fileapi::ExternalMountPoints* external_mount_points, 2302 fileapi::ExternalMountPoints* external_mount_points,
2303 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) { 2303 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2304 #if !defined(OS_ANDROID) 2304 #if !defined(OS_ANDROID)
2305 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2305 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2306 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2306 additional_backends->push_back(new MediaFileSystemBackend(
2307 storage_partition_path, 2307 storage_partition_path,
2308 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2308 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2309 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); 2309 MediaFileSystemBackend::kMediaTaskRunnerName)).get()));
2310 #endif 2310 #endif
2311 #if defined(OS_CHROMEOS) 2311 #if defined(OS_CHROMEOS)
2312 DCHECK(external_mount_points); 2312 DCHECK(external_mount_points);
2313 chromeos::CrosMountPointProvider* cros_mount_provider = 2313 chromeos::FileSystemBackend* backend =
2314 new chromeos::CrosMountPointProvider( 2314 new chromeos::FileSystemBackend(
2315 special_storage_policy, 2315 special_storage_policy,
2316 external_mount_points, 2316 external_mount_points,
2317 fileapi::ExternalMountPoints::GetSystemInstance()); 2317 fileapi::ExternalMountPoints::GetSystemInstance());
2318 cros_mount_provider->AddSystemMountPoints(); 2318 backend->AddSystemMountPoints();
2319 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); 2319 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2320 additional_providers->push_back(cros_mount_provider); 2320 additional_backends->push_back(backend);
2321 #endif 2321 #endif
2322 } 2322 }
2323 2323
2324 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2324 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2325 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2325 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2326 const CommandLine& command_line, 2326 const CommandLine& command_line,
2327 int child_process_id, 2327 int child_process_id,
2328 std::vector<FileDescriptorInfo>* mappings) { 2328 std::vector<FileDescriptorInfo>* mappings) {
2329 #if defined(OS_ANDROID) 2329 #if defined(OS_ANDROID)
2330 base::FilePath data_path; 2330 base::FilePath data_path;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2421 #if defined(USE_NSS) 2421 #if defined(USE_NSS)
2422 crypto::CryptoModuleBlockingPasswordDelegate* 2422 crypto::CryptoModuleBlockingPasswordDelegate*
2423 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2423 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2424 const GURL& url) { 2424 const GURL& url) {
2425 return chrome::NewCryptoModuleBlockingDialogDelegate( 2425 return chrome::NewCryptoModuleBlockingDialogDelegate(
2426 chrome::kCryptoModulePasswordKeygen, url.host()); 2426 chrome::kCryptoModulePasswordKeygen, url.host());
2427 } 2427 }
2428 #endif 2428 #endif
2429 2429
2430 } // namespace chrome 2430 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698