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

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: address comments 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/drive/mount_point_provider_delegate.h" 151 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h"
152 #include "chrome/browser/chromeos/fileapi/cros_mount_point_provider.h" 152 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
153 #include "chrome/browser/chromeos/login/startup_utils.h" 153 #include "chrome/browser/chromeos/login/startup_utils.h"
154 #include "chrome/browser/chromeos/login/user_manager.h" 154 #include "chrome/browser/chromeos/login/user_manager.h"
155 #include "chrome/browser/chromeos/system/statistics_provider.h" 155 #include "chrome/browser/chromeos/system/statistics_provider.h"
156 #include "chromeos/chromeos_switches.h" 156 #include "chromeos/chromeos_switches.h"
157 #elif defined(OS_LINUX) 157 #elif defined(OS_LINUX)
158 #include "chrome/browser/chrome_browser_main_linux.h" 158 #include "chrome/browser/chrome_browser_main_linux.h"
159 #elif defined(OS_ANDROID) 159 #elif defined(OS_ANDROID)
160 #include "chrome/browser/android/crash_dump_manager.h" 160 #include "chrome/browser/android/crash_dump_manager.h"
161 #include "chrome/browser/chrome_browser_main_android.h" 161 #include "chrome/browser/chrome_browser_main_android.h"
162 #include "chrome/common/descriptors_android.h" 162 #include "chrome/common/descriptors_android.h"
(...skipping 17 matching lines...) Expand all
180 #if defined(USE_NSS) 180 #if defined(USE_NSS)
181 #include "chrome/browser/ui/crypto_module_password_dialog.h" 181 #include "chrome/browser/ui/crypto_module_password_dialog.h"
182 #endif 182 #endif
183 183
184 #if !defined(OS_CHROMEOS) 184 #if !defined(OS_CHROMEOS)
185 #include "chrome/browser/signin/signin_manager.h" 185 #include "chrome/browser/signin/signin_manager.h"
186 #include "chrome/browser/signin/signin_manager_factory.h" 186 #include "chrome/browser/signin/signin_manager_factory.h"
187 #endif 187 #endif
188 188
189 #if !defined(OS_ANDROID) 189 #if !defined(OS_ANDROID)
190 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h" 190 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
191 #endif 191 #endif
192 192
193 #if defined(ENABLE_WEBRTC) 193 #if defined(ENABLE_WEBRTC)
194 #include "chrome/browser/media/webrtc_logging_handler_host.h" 194 #include "chrome/browser/media/webrtc_logging_handler_host.h"
195 #endif 195 #endif
196 196
197 #if defined(FILE_MANAGER_EXTENSION) 197 #if defined(FILE_MANAGER_EXTENSION)
198 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" 198 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
199 #endif 199 #endif
200 200
(...skipping 2093 matching lines...) Expand 10 before | Expand all | Expand 10 after
2294 } 2294 }
2295 2295
2296 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2296 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2297 std::vector<std::string>* additional_allowed_schemes) { 2297 std::vector<std::string>* additional_allowed_schemes) {
2298 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2298 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2299 additional_allowed_schemes); 2299 additional_allowed_schemes);
2300 additional_allowed_schemes->push_back(kChromeUIScheme); 2300 additional_allowed_schemes->push_back(kChromeUIScheme);
2301 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2301 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2302 } 2302 }
2303 2303
2304 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( 2304 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2305 const base::FilePath& storage_partition_path, 2305 const base::FilePath& storage_partition_path,
2306 quota::SpecialStoragePolicy* special_storage_policy, 2306 quota::SpecialStoragePolicy* special_storage_policy,
2307 fileapi::ExternalMountPoints* external_mount_points, 2307 fileapi::ExternalMountPoints* external_mount_points,
2308 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) { 2308 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2309 #if !defined(OS_ANDROID) 2309 #if !defined(OS_ANDROID)
2310 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2310 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2311 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2311 additional_backends->push_back(new MediaFileSystemBackend(
2312 storage_partition_path, 2312 storage_partition_path,
2313 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2313 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2314 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); 2314 MediaFileSystemBackend::kMediaTaskRunnerName)).get()));
2315 #endif 2315 #endif
2316 #if defined(OS_CHROMEOS) 2316 #if defined(OS_CHROMEOS)
2317 DCHECK(external_mount_points); 2317 DCHECK(external_mount_points);
2318 chromeos::CrosMountPointProvider* cros_mount_provider = 2318 chromeos::FileSystemBackend* backend =
2319 new chromeos::CrosMountPointProvider( 2319 new chromeos::FileSystemBackend(
2320 new drive::MountPointProviderDelegate(external_mount_points), 2320 new drive::FileSystemBackendDelegate(external_mount_points),
2321 special_storage_policy, 2321 special_storage_policy,
2322 external_mount_points, 2322 external_mount_points,
2323 fileapi::ExternalMountPoints::GetSystemInstance()); 2323 fileapi::ExternalMountPoints::GetSystemInstance());
2324 cros_mount_provider->AddSystemMountPoints(); 2324 backend->AddSystemMountPoints();
2325 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); 2325 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2326 additional_providers->push_back(cros_mount_provider); 2326 additional_backends->push_back(backend);
2327 #endif 2327 #endif
2328 } 2328 }
2329 2329
2330 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2330 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2331 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2331 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2332 const CommandLine& command_line, 2332 const CommandLine& command_line,
2333 int child_process_id, 2333 int child_process_id,
2334 std::vector<FileDescriptorInfo>* mappings) { 2334 std::vector<FileDescriptorInfo>* mappings) {
2335 #if defined(OS_ANDROID) 2335 #if defined(OS_ANDROID)
2336 base::FilePath data_path; 2336 base::FilePath data_path;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2427 #if defined(USE_NSS) 2427 #if defined(USE_NSS)
2428 crypto::CryptoModuleBlockingPasswordDelegate* 2428 crypto::CryptoModuleBlockingPasswordDelegate*
2429 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2429 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2430 const GURL& url) { 2430 const GURL& url) {
2431 return chrome::NewCryptoModuleBlockingDialogDelegate( 2431 return chrome::NewCryptoModuleBlockingDialogDelegate(
2432 chrome::kCryptoModulePasswordKeygen, url.host()); 2432 chrome::kCryptoModulePasswordKeygen, url.host());
2433 } 2433 }
2434 #endif 2434 #endif
2435 2435
2436 } // namespace chrome 2436 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698