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

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: rebase 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(ENABLE_INPUT_SPEECH) 197 #if defined(ENABLE_INPUT_SPEECH)
198 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h" 198 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubbl e_ui.h"
199 #endif 199 #endif
200 200
(...skipping 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 } 2298 }
2299 2299
2300 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2300 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2301 std::vector<std::string>* additional_allowed_schemes) { 2301 std::vector<std::string>* additional_allowed_schemes) {
2302 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2302 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2303 additional_allowed_schemes); 2303 additional_allowed_schemes);
2304 additional_allowed_schemes->push_back(kChromeUIScheme); 2304 additional_allowed_schemes->push_back(kChromeUIScheme);
2305 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2305 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2306 } 2306 }
2307 2307
2308 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( 2308 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2309 const base::FilePath& storage_partition_path, 2309 const base::FilePath& storage_partition_path,
2310 quota::SpecialStoragePolicy* special_storage_policy, 2310 quota::SpecialStoragePolicy* special_storage_policy,
2311 fileapi::ExternalMountPoints* external_mount_points, 2311 fileapi::ExternalMountPoints* external_mount_points,
2312 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) { 2312 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2313 #if !defined(OS_ANDROID) 2313 #if !defined(OS_ANDROID)
2314 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2314 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2315 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2315 additional_backends->push_back(new MediaFileSystemBackend(
2316 storage_partition_path, 2316 storage_partition_path,
2317 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( 2317 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2318 MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); 2318 MediaFileSystemBackend::kMediaTaskRunnerName)).get()));
2319 #endif 2319 #endif
2320 #if defined(OS_CHROMEOS) 2320 #if defined(OS_CHROMEOS)
2321 DCHECK(external_mount_points); 2321 DCHECK(external_mount_points);
2322 chromeos::CrosMountPointProvider* cros_mount_provider = 2322 chromeos::FileSystemBackend* backend =
2323 new chromeos::CrosMountPointProvider( 2323 new chromeos::FileSystemBackend(
2324 new drive::MountPointProviderDelegate(external_mount_points), 2324 new drive::FileSystemBackendDelegate(external_mount_points),
2325 special_storage_policy, 2325 special_storage_policy,
2326 external_mount_points, 2326 external_mount_points,
2327 fileapi::ExternalMountPoints::GetSystemInstance()); 2327 fileapi::ExternalMountPoints::GetSystemInstance());
2328 cros_mount_provider->AddSystemMountPoints(); 2328 backend->AddSystemMountPoints();
2329 DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal)); 2329 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2330 additional_providers->push_back(cros_mount_provider); 2330 additional_backends->push_back(backend);
2331 #endif 2331 #endif
2332 } 2332 }
2333 2333
2334 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2334 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2335 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2335 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2336 const CommandLine& command_line, 2336 const CommandLine& command_line,
2337 int child_process_id, 2337 int child_process_id,
2338 std::vector<FileDescriptorInfo>* mappings) { 2338 std::vector<FileDescriptorInfo>* mappings) {
2339 #if defined(OS_ANDROID) 2339 #if defined(OS_ANDROID)
2340 base::FilePath data_path; 2340 base::FilePath data_path;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2431 #if defined(USE_NSS) 2431 #if defined(USE_NSS)
2432 crypto::CryptoModuleBlockingPasswordDelegate* 2432 crypto::CryptoModuleBlockingPasswordDelegate*
2433 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2433 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2434 const GURL& url) { 2434 const GURL& url) {
2435 return chrome::NewCryptoModuleBlockingDialogDelegate( 2435 return chrome::NewCryptoModuleBlockingDialogDelegate(
2436 chrome::kCryptoModulePasswordKeygen, url.host()); 2436 chrome::kCryptoModulePasswordKeygen, url.host());
2437 } 2437 }
2438 #endif 2438 #endif
2439 2439
2440 } // namespace chrome 2440 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/drive/file_system_backend_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698