| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 const GURL& url, | 362 const GURL& url, |
| 363 bool allowed_by_default, | 363 bool allowed_by_default, |
| 364 const base::Callback<void(bool)>& callback); | 364 const base::Callback<void(bool)>& callback); |
| 365 #endif | 365 #endif |
| 366 | 366 |
| 367 // The value pointed to by |settings| should remain valid until the | 367 // The value pointed to by |settings| should remain valid until the |
| 368 // the function is called again with a new value or a nullptr. | 368 // the function is called again with a new value or a nullptr. |
| 369 static void SetDefaultQuotaSettingsForTesting( | 369 static void SetDefaultQuotaSettingsForTesting( |
| 370 const storage::QuotaSettings *settings); | 370 const storage::QuotaSettings *settings); |
| 371 | 371 |
| 372 // The constructor of memory_instrumentation::CoordinatorImpl, and so the |
| 373 // GetInstance method, should be called on the UI thread. |
| 374 void ExposeMemoryInstrumentationOnUIThread( |
| 375 service_manager::InterfaceRegistry* registry); |
| 376 |
| 372 #if BUILDFLAG(ENABLE_PLUGINS) | 377 #if BUILDFLAG(ENABLE_PLUGINS) |
| 373 // Set of origins that can use TCP/UDP private APIs from NaCl. | 378 // Set of origins that can use TCP/UDP private APIs from NaCl. |
| 374 std::set<std::string> allowed_socket_origins_; | 379 std::set<std::string> allowed_socket_origins_; |
| 375 // Set of origins that can get a handle for FileIO from NaCl. | 380 // Set of origins that can get a handle for FileIO from NaCl. |
| 376 std::set<std::string> allowed_file_handle_origins_; | 381 std::set<std::string> allowed_file_handle_origins_; |
| 377 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable | 382 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable |
| 378 // versions of Chrome. | 383 // versions of Chrome. |
| 379 std::set<std::string> allowed_dev_channel_origins_; | 384 std::set<std::string> allowed_dev_channel_origins_; |
| 380 #endif | 385 #endif |
| 381 | 386 |
| 382 // Vector of additional ChromeContentBrowserClientParts. | 387 // Vector of additional ChromeContentBrowserClientParts. |
| 383 // Parts are deleted in the reverse order they are added. | 388 // Parts are deleted in the reverse order they are added. |
| 384 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 389 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 385 | 390 |
| 386 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 391 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 387 | 392 |
| 388 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 393 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 389 }; | 394 }; |
| 390 | 395 |
| 391 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 396 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |