| OLD | NEW |
| 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 2411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2422 new chromeos::FileSystemBackend( | 2422 new chromeos::FileSystemBackend( |
| 2423 new drive::FileSystemBackendDelegate(browser_context), | 2423 new drive::FileSystemBackendDelegate(browser_context), |
| 2424 browser_context->GetSpecialStoragePolicy(), | 2424 browser_context->GetSpecialStoragePolicy(), |
| 2425 external_mount_points, | 2425 external_mount_points, |
| 2426 fileapi::ExternalMountPoints::GetSystemInstance()); | 2426 fileapi::ExternalMountPoints::GetSystemInstance()); |
| 2427 backend->AddSystemMountPoints(); | 2427 backend->AddSystemMountPoints(); |
| 2428 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); | 2428 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); |
| 2429 additional_backends->push_back(backend); | 2429 additional_backends->push_back(backend); |
| 2430 #endif | 2430 #endif |
| 2431 | 2431 |
| 2432 additional_backends->push_back(new sync_file_system::SyncFileSystemBackend()); | 2432 additional_backends->push_back( |
| 2433 new sync_file_system::SyncFileSystemBackend( |
| 2434 Profile::FromBrowserContext(browser_context))); |
| 2433 } | 2435 } |
| 2434 | 2436 |
| 2435 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 2437 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 2436 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 2438 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| 2437 const CommandLine& command_line, | 2439 const CommandLine& command_line, |
| 2438 int child_process_id, | 2440 int child_process_id, |
| 2439 std::vector<FileDescriptorInfo>* mappings) { | 2441 std::vector<FileDescriptorInfo>* mappings) { |
| 2440 #if defined(OS_ANDROID) | 2442 #if defined(OS_ANDROID) |
| 2441 base::FilePath data_path; | 2443 base::FilePath data_path; |
| 2442 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); | 2444 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2524 #if defined(USE_NSS) | 2526 #if defined(USE_NSS) |
| 2525 crypto::CryptoModuleBlockingPasswordDelegate* | 2527 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2526 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2528 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2527 const GURL& url) { | 2529 const GURL& url) { |
| 2528 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2530 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2529 chrome::kCryptoModulePasswordKeygen, url.host()); | 2531 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2530 } | 2532 } |
| 2531 #endif | 2533 #endif |
| 2532 | 2534 |
| 2533 } // namespace chrome | 2535 } // namespace chrome |
| OLD | NEW |