From 962d46c393b425ba908d1e9d56eb711049a9a698 Mon Sep 17 00:00:00 2001 From: "cdn@chromium.org" Date: Mon, 12 Sep 2011 23:59:29 +0000 Subject: Prevent mixed content warnings from being displayed when an iframe loads a page and dns resolution fails (which displays chrome: content in the iframe). This does not allow chrome: uris to be loaded in other cases (this is explicitely blocked above the change) BUG=57198 TEST=N/A Review URL: http://codereview.chromium.org/7824056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100808 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/chrome_content_renderer_client.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 78089e6..b53f990 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -209,7 +209,10 @@ void ChromeContentRendererClient::RenderThreadStarted() { WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs( chrome_ui_scheme); - // chrome-extension: resources shouldn't trigger insecure content warnings. + // chrome:, and chrome-extension: resources shouldn't trigger insecure + // content warnings. + WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); + WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); } -- cgit v1.1