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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
239 const content::SocketPermissionRequest& params) OVERRIDE; | 239 const content::SocketPermissionRequest& params) OVERRIDE; |
240 virtual base::FilePath GetHyphenDictionaryDirectory() OVERRIDE; | 240 virtual base::FilePath GetHyphenDictionaryDirectory() OVERRIDE; |
241 virtual ui::SelectFilePolicy* CreateSelectFilePolicy( | 241 virtual ui::SelectFilePolicy* CreateSelectFilePolicy( |
242 content::WebContents* web_contents) OVERRIDE; | 242 content::WebContents* web_contents) OVERRIDE; |
243 virtual void GetAdditionalAllowedSchemesForFileSystem( | 243 virtual void GetAdditionalAllowedSchemesForFileSystem( |
244 std::vector<std::string>* additional_schemes) OVERRIDE; | 244 std::vector<std::string>* additional_schemes) OVERRIDE; |
245 virtual void GetAdditionalFileSystemMountPointProviders( | 245 virtual void GetAdditionalFileSystemMountPointProviders( |
246 const base::FilePath& storage_partition_path, | 246 const base::FilePath& storage_partition_path, |
247 quota::SpecialStoragePolicy* special_storage_policy, | 247 quota::SpecialStoragePolicy* special_storage_policy, |
248 fileapi::ExternalMountPoints* external_mount_points, | 248 fileapi::ExternalMountPoints* external_mount_points, |
249 quota::QuotaManagerProxy* quota_manager_proxy, | |
250 fileapi::FileSystemTaskRunners* task_runners, | |
251 const fileapi::FileSystemOptions& options, | |
kinuko
2013/07/08 12:31:20
Fyi, we're changing some params of this method in
nhiroki
2013/07/22 04:34:14
Rebased. Thanks!
| |
249 ScopedVector<fileapi::FileSystemMountPointProvider>* | 252 ScopedVector<fileapi::FileSystemMountPointProvider>* |
250 additional_providers) OVERRIDE; | 253 additional_providers) OVERRIDE; |
251 | 254 |
252 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 255 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
253 virtual void GetAdditionalMappedFilesForChildProcess( | 256 virtual void GetAdditionalMappedFilesForChildProcess( |
254 const CommandLine& command_line, | 257 const CommandLine& command_line, |
255 int child_process_id, | 258 int child_process_id, |
256 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; | 259 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; |
257 #endif | 260 #endif |
258 #if defined(OS_WIN) | 261 #if defined(OS_WIN) |
(...skipping 14 matching lines...) Expand all Loading... | |
273 #endif | 276 #endif |
274 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> | 277 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> |
275 permissions_policy_delegate_; | 278 permissions_policy_delegate_; |
276 | 279 |
277 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 280 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
278 }; | 281 }; |
279 | 282 |
280 } // namespace chrome | 283 } // namespace chrome |
281 | 284 |
282 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 285 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |