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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 new fileapi::FileSystemTaskRunners( | 62 new fileapi::FileSystemTaskRunners( |
63 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), | 63 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), |
64 file_task_runner.get())); | 64 file_task_runner.get())); |
65 | 65 |
66 // Setting up additional mount point providers. | 66 // Setting up additional mount point providers. |
67 ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; | 67 ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; |
68 GetContentClient()->browser()->GetAdditionalFileSystemMountPointProviders( | 68 GetContentClient()->browser()->GetAdditionalFileSystemMountPointProviders( |
69 profile_path, | 69 profile_path, |
70 special_storage_policy, | 70 special_storage_policy, |
71 external_mount_points, | 71 external_mount_points, |
| 72 quota_manager_proxy, |
| 73 task_runners.get(), |
| 74 CreateBrowserFileSystemOptions(is_incognito), |
72 &additional_providers); | 75 &additional_providers); |
73 | 76 |
74 scoped_refptr<fileapi::FileSystemContext> file_system_context = | 77 scoped_refptr<fileapi::FileSystemContext> file_system_context = |
75 new fileapi::FileSystemContext( | 78 new fileapi::FileSystemContext( |
76 task_runners.Pass(), | 79 task_runners.Pass(), |
77 external_mount_points, | 80 external_mount_points, |
78 special_storage_policy, | 81 special_storage_policy, |
79 quota_manager_proxy, | 82 quota_manager_proxy, |
80 additional_providers.Pass(), | 83 additional_providers.Pass(), |
81 profile_path, | 84 profile_path, |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 // for the file. (We first need to check if it can already be read not to | 152 // for the file. (We first need to check if it can already be read not to |
150 // overwrite existing permissions) | 153 // overwrite existing permissions) |
151 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( | 154 if (!ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile( |
152 process_id, *platform_path)) { | 155 process_id, *platform_path)) { |
153 ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile( | 156 ChildProcessSecurityPolicyImpl::GetInstance()->GrantReadFile( |
154 process_id, *platform_path); | 157 process_id, *platform_path); |
155 } | 158 } |
156 } | 159 } |
157 | 160 |
158 } // namespace content | 161 } // namespace content |
OLD | NEW |