| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 | 332 |
| 333 #if defined(ENABLE_PLUGINS) | 333 #if defined(ENABLE_PLUGINS) |
| 334 // Set of origins that can use TCP/UDP private APIs from NaCl. | 334 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 335 std::set<std::string> allowed_socket_origins_; | 335 std::set<std::string> allowed_socket_origins_; |
| 336 // Set of origins that can get a handle for FileIO from NaCl. | 336 // Set of origins that can get a handle for FileIO from NaCl. |
| 337 std::set<std::string> allowed_file_handle_origins_; | 337 std::set<std::string> allowed_file_handle_origins_; |
| 338 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 338 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
| 339 // versions of Chrome. | 339 // versions of Chrome. |
| 340 std::set<std::string> allowed_dev_channel_origins_; | 340 std::set<std::string> allowed_dev_channel_origins_; |
| 341 #endif | 341 #endif |
| 342 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> | |
| 343 permissions_policy_delegate_; | |
| 344 | 342 |
| 345 // The prerender tracker used to determine whether a render process is used | 343 // The prerender tracker used to determine whether a render process is used |
| 346 // for prerendering and an override cookie store must be provided. | 344 // for prerendering and an override cookie store must be provided. |
| 347 // This needs to be kept as a member rather than just looked up from | 345 // This needs to be kept as a member rather than just looked up from |
| 348 // the profile due to initialization ordering, as well as due to threading. | 346 // the profile due to initialization ordering, as well as due to threading. |
| 349 // It is initialized on the UI thread when the ResoureDispatcherHost is | 347 // It is initialized on the UI thread when the ResoureDispatcherHost is |
| 350 // created. It is used only the IO thread. | 348 // created. It is used only the IO thread. |
| 351 prerender::PrerenderTracker* prerender_tracker_; | 349 prerender::PrerenderTracker* prerender_tracker_; |
| 352 | 350 |
| 353 // Vector of additional ChromeContentBrowserClientParts. | 351 // Vector of additional ChromeContentBrowserClientParts. |
| 354 // Parts are deleted in the reverse order they are added. | 352 // Parts are deleted in the reverse order they are added. |
| 355 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 353 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 356 | 354 |
| 357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 355 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 358 | 356 |
| 359 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 357 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 360 }; | 358 }; |
| 361 | 359 |
| 362 } // namespace chrome | 360 } // namespace chrome |
| 363 | 361 |
| 364 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 362 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |