| 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 bool allow); | 285 bool allow); |
| 286 | 286 |
| 287 static void RequestFileSystemPermissionOnUIThread( | 287 static void RequestFileSystemPermissionOnUIThread( |
| 288 int render_process_id, | 288 int render_process_id, |
| 289 int render_frame_id, | 289 int render_frame_id, |
| 290 const GURL& url, | 290 const GURL& url, |
| 291 bool allowed_by_default, | 291 bool allowed_by_default, |
| 292 const base::Callback<void(bool)>& callback); | 292 const base::Callback<void(bool)>& callback); |
| 293 #endif | 293 #endif |
| 294 | 294 |
| 295 void ConfigureMojoShell(content::MojoShellContext* context) override; |
| 296 |
| 295 #if defined(ENABLE_PLUGINS) | 297 #if defined(ENABLE_PLUGINS) |
| 296 // Set of origins that can use TCP/UDP private APIs from NaCl. | 298 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 297 std::set<std::string> allowed_socket_origins_; | 299 std::set<std::string> allowed_socket_origins_; |
| 298 // Set of origins that can get a handle for FileIO from NaCl. | 300 // Set of origins that can get a handle for FileIO from NaCl. |
| 299 std::set<std::string> allowed_file_handle_origins_; | 301 std::set<std::string> allowed_file_handle_origins_; |
| 300 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 302 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
| 301 // versions of Chrome. | 303 // versions of Chrome. |
| 302 std::set<std::string> allowed_dev_channel_origins_; | 304 std::set<std::string> allowed_dev_channel_origins_; |
| 303 #endif | 305 #endif |
| 304 | 306 |
| 305 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 307 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 306 base::ScopedFD v8_natives_fd_; | 308 base::ScopedFD v8_natives_fd_; |
| 307 base::ScopedFD v8_snapshot_fd_; | 309 base::ScopedFD v8_snapshot_fd_; |
| 308 #endif // OS_POSIX && !OS_MACOSX | 310 #endif // OS_POSIX && !OS_MACOSX |
| 309 | 311 |
| 310 // Vector of additional ChromeContentBrowserClientParts. | 312 // Vector of additional ChromeContentBrowserClientParts. |
| 311 // Parts are deleted in the reverse order they are added. | 313 // Parts are deleted in the reverse order they are added. |
| 312 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 314 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 313 | 315 |
| 314 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 316 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 315 | 317 |
| 316 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 318 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 317 }; | 319 }; |
| 318 | 320 |
| 319 } // namespace chrome | 321 } // namespace chrome |
| 320 | 322 |
| 321 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 323 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |