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 "content/browser/fileapi/browser_file_system_helper.h" | 5 #include "content/browser/fileapi/browser_file_system_helper.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); | 57 pool->GetNamedSequenceToken(fileapi::kMediaTaskRunnerName); |
58 | 58 |
59 scoped_ptr<fileapi::FileSystemTaskRunners> task_runners( | 59 scoped_ptr<fileapi::FileSystemTaskRunners> task_runners( |
60 new fileapi::FileSystemTaskRunners( | 60 new fileapi::FileSystemTaskRunners( |
61 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 61 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
62 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), | 62 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), |
63 pool->GetSequencedTaskRunner(media_sequence_token))); | 63 pool->GetSequencedTaskRunner(media_sequence_token))); |
64 | 64 |
65 // Setting up additional mount point providers. | 65 // Setting up additional mount point providers. |
66 ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; | 66 ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; |
| 67 GetContentClient()->browser()->GetAdditionalFileSystemMountPointProviders( |
| 68 &additional_providers); |
| 69 |
67 return new fileapi::FileSystemContext( | 70 return new fileapi::FileSystemContext( |
68 task_runners.Pass(), | 71 task_runners.Pass(), |
69 external_mount_points, | 72 external_mount_points, |
70 special_storage_policy, | 73 special_storage_policy, |
71 quota_manager_proxy, | 74 quota_manager_proxy, |
72 ScopedVector<fileapi::FileSystemMountPointProvider>(), | 75 ScopedVector<fileapi::FileSystemMountPointProvider>(), |
73 profile_path, | 76 profile_path, |
74 CreateBrowserFileSystemOptions(is_incognito)); | 77 CreateBrowserFileSystemOptions(is_incognito)); |
75 } | 78 } |
76 | 79 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 // for the file. (We first need to check if it can already be read not to | 164 // for the file. (We first need to check if it can already be read not to |
162 // overwrite existing permissions) | 165 // overwrite existing permissions) |
163 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( | 166 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( |
164 process_id, *platform_path)) { | 167 process_id, *platform_path)) { |
165 ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile( | 168 ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile( |
166 process_id, *platform_path); | 169 process_id, *platform_path); |
167 } | 170 } |
168 } | 171 } |
169 | 172 |
170 } // namespace content | 173 } // namespace content |
OLD | NEW |