| 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 1c0061613bc0641f7d5913f28007a21177621999..c1736b3b879dd81d38abe6ab70b0196a2e16be8b 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -400,23 +400,22 @@ void ChromeContentRendererClient::RenderThreadStarted() {
|
| WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
|
| chrome_search_scheme);
|
|
|
| - // chrome:, chrome-search:, and chrome-extension: resources shouldn't trigger
|
| - // insecure content warnings.
|
| + // chrome:, chrome-search:, chrome-extension:, and chrome-extension-resource:
|
| + // resources shouldn't trigger insecure content warnings.
|
| WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
|
| WebSecurityPolicy::registerURLSchemeAsSecure(chrome_search_scheme);
|
|
|
| WebString extension_scheme(ASCIIToUTF16(extensions::kExtensionScheme));
|
| WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
|
|
|
| - // chrome-extension: resources should be allowed to receive CORS requests.
|
| - WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_scheme);
|
| -
|
| WebString extension_resource_scheme(
|
| ASCIIToUTF16(extensions::kExtensionResourceScheme));
|
| WebSecurityPolicy::registerURLSchemeAsSecure(extension_resource_scheme);
|
|
|
| - // chrome-extension-resource: resources should be allowed to receive CORS
|
| - // requests.
|
| + // chrome:, chrome-extension:, chrome-extension-resource: resources should be
|
| + // allowed to receive CORS requests.
|
| + WebSecurityPolicy::registerURLSchemeAsCORSEnabled(chrome_ui_scheme);
|
| + WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_scheme);
|
| WebSecurityPolicy::registerURLSchemeAsCORSEnabled(extension_resource_scheme);
|
|
|
| // chrome-extension: resources should bypass Content Security Policy checks
|
|
|