Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 5bc5267dedd73d7315aba3a4dfe7d93bb1463b8e..9913a6ec87d0bcc576ed5849f365a4f190076714 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -497,29 +497,11 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( |
chrome_search_scheme); |
- // chrome-search:, chrome-extension:, and chrome-extension-resource: |
- // resources shouldn't trigger insecure content warnings. |
+ // chrome-search: resources shouldn't trigger insecure content warnings. Note |
+ // that chrome-extension: and chrome-extension-resource: schemes are taken |
+ // 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.
|
WebSecurityPolicy::registerURLSchemeAsSecure(chrome_search_scheme); |
- WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme)); |
- WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); |
- |
- WebString extension_resource_scheme( |
- ASCIIToUTF16(extensions::kExtensionResourceScheme)); |
- WebSecurityPolicy::registerURLSchemeAsSecure(extension_resource_scheme); |
- |
- // chrome:, chrome-extension:, chrome-extension-resource: resources should be |
- // allowed to receive CORS requests. |
- WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_scheme); |
- WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_resource_scheme); |
- |
- // chrome-extension: resources should bypass Content Security Policy checks |
- // when included in protected resources. |
- WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
- extension_scheme); |
- WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy( |
- extension_resource_scheme); |
- |
#if defined(ENABLE_PRINT_PREVIEW) |
pdf_print_client_.reset(new ChromePDFPrintClient()); |
pdf::PepperPDFHost::SetPrintClient(pdf_print_client_.get()); |