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 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2501 additional_backends->push_back(new MediaFileSystemBackend( | 2501 additional_backends->push_back(new MediaFileSystemBackend( |
2502 storage_partition_path, | 2502 storage_partition_path, |
2503 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( | 2503 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( |
2504 MediaFileSystemBackend::kMediaTaskRunnerName)).get())); | 2504 MediaFileSystemBackend::kMediaTaskRunnerName)).get())); |
2505 #endif | 2505 #endif |
2506 #if defined(OS_CHROMEOS) | 2506 #if defined(OS_CHROMEOS) |
2507 fileapi::ExternalMountPoints* external_mount_points = | 2507 fileapi::ExternalMountPoints* external_mount_points = |
2508 content::BrowserContext::GetMountPoints(browser_context); | 2508 content::BrowserContext::GetMountPoints(browser_context); |
2509 DCHECK(external_mount_points); | 2509 DCHECK(external_mount_points); |
2510 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( | 2510 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( |
| 2511 storage_partition_path, |
2511 new drive::FileSystemBackendDelegate, | 2512 new drive::FileSystemBackendDelegate, |
2512 new chromeos::file_system_provider::BackendDelegate, | 2513 new chromeos::file_system_provider::BackendDelegate, |
2513 browser_context->GetSpecialStoragePolicy(), | 2514 browser_context->GetSpecialStoragePolicy(), |
2514 external_mount_points, | 2515 external_mount_points, |
2515 fileapi::ExternalMountPoints::GetSystemInstance()); | 2516 fileapi::ExternalMountPoints::GetSystemInstance()); |
2516 backend->AddSystemMountPoints(); | 2517 backend->AddSystemMountPoints(); |
2517 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); | 2518 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); |
2518 additional_backends->push_back(backend); | 2519 additional_backends->push_back(backend); |
2519 #endif | 2520 #endif |
2520 | 2521 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2678 switches::kDisableWebRtcEncryption, | 2679 switches::kDisableWebRtcEncryption, |
2679 }; | 2680 }; |
2680 to_command_line->CopySwitchesFrom(from_command_line, | 2681 to_command_line->CopySwitchesFrom(from_command_line, |
2681 kWebRtcDevSwitchNames, | 2682 kWebRtcDevSwitchNames, |
2682 arraysize(kWebRtcDevSwitchNames)); | 2683 arraysize(kWebRtcDevSwitchNames)); |
2683 } | 2684 } |
2684 } | 2685 } |
2685 #endif // defined(ENABLE_WEBRTC) | 2686 #endif // defined(ENABLE_WEBRTC) |
2686 | 2687 |
2687 } // namespace chrome | 2688 } // namespace chrome |
OLD | NEW |