Chromium Code Reviews| 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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 LoadExternalIPCDumper(dump_directory); | 490 LoadExternalIPCDumper(dump_directory); |
| 491 thread->GetChannel()->set_outgoing_message_filter(filter); | 491 thread->GetChannel()->set_outgoing_message_filter(filter); |
| 492 } | 492 } |
| 493 #endif | 493 #endif |
| 494 | 494 |
| 495 // chrome-search: pages should not be accessible by bookmarklets | 495 // chrome-search: pages should not be accessible by bookmarklets |
| 496 // or javascript: URLs typed in the omnibox. | 496 // or javascript: URLs typed in the omnibox. |
| 497 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( | 497 WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
| 498 chrome_search_scheme); | 498 chrome_search_scheme); |
| 499 | 499 |
| 500 // chrome-search:, chrome-extension:, and chrome-extension-resource: | 500 // chrome-search: resources shouldn't trigger insecure content warnings. Note |
| 501 // resources shouldn't trigger insecure content warnings. | 501 // that chrome-extension: and chrome-extension-resource: schemes are taken |
| 502 // care of in extension::Dispatcher. | |
|
Devlin
2015/08/20 18:29:34
nitty nit: extensions::, not extension::
jww
2015/08/20 22:59:03
Done.
| |
| 502 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_search_scheme); | 503 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_search_scheme); |
| 503 | 504 |
| 504 WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme)); | |
| 505 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); | |
| 506 | |
| 507 WebString extension_resource_scheme( | |
| 508 ASCIIToUTF16(extensions::kExtensionResourceScheme)); | |
| 509 WebSecurityPolicy::registerURLSchemeAsSecure(extension_resource_scheme); | |
| 510 | |
| 511 // chrome:, chrome-extension:, chrome-extension-resource: resources should be | |
| 512 // allowed to receive CORS requests. | |
| 513 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_scheme); | |
| 514 WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_resource_scheme); | |
| 515 | |
| 516 // chrome-extension: resources should bypass Content Security Policy checks | |
| 517 // when included in protected resources. | |
| 518 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( | |
| 519 extension_scheme); | |
| 520 WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( | |
| 521 extension_resource_scheme); | |
| 522 | |
| 523 #if defined(ENABLE_PRINT_PREVIEW) | 505 #if defined(ENABLE_PRINT_PREVIEW) |
| 524 pdf_print_client_.reset(new ChromePDFPrintClient()); | 506 pdf_print_client_.reset(new ChromePDFPrintClient()); |
| 525 pdf::PepperPDFHost::SetPrintClient(pdf_print_client_.get()); | 507 pdf::PepperPDFHost::SetPrintClient(pdf_print_client_.get()); |
| 526 #endif | 508 #endif |
| 527 | 509 |
| 528 std::set<GURL> origins; | 510 std::set<GURL> origins; |
| 529 GetSecureOriginWhitelist(&origins); | 511 GetSecureOriginWhitelist(&origins); |
| 530 for (const GURL& origin : origins) { | 512 for (const GURL& origin : origins) { |
| 531 WebSecurityPolicy::addOriginTrustworthyWhiteList( | 513 WebSecurityPolicy::addOriginTrustworthyWhiteList( |
| 532 WebSecurityOrigin::create(origin)); | 514 WebSecurityOrigin::create(origin)); |
| (...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1662 | 1644 |
| 1663 void | 1645 void |
| 1664 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread( | 1646 ChromeContentRendererClient::DidInitializeServiceWorkerContextOnWorkerThread( |
| 1665 v8::Local<v8::Context> context, | 1647 v8::Local<v8::Context> context, |
| 1666 const GURL& url) { | 1648 const GURL& url) { |
| 1667 #if defined(ENABLE_EXTENSIONS) | 1649 #if defined(ENABLE_EXTENSIONS) |
| 1668 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( | 1650 extensions::Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread( |
| 1669 context, url); | 1651 context, url); |
| 1670 #endif | 1652 #endif |
| 1671 } | 1653 } |
| OLD | NEW |