diff options
| author | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 23:59:29 +0000 |
|---|---|---|
| committer | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 23:59:29 +0000 |
| commit | 962d46c393b425ba908d1e9d56eb711049a9a698 (patch) | |
| tree | 479ae4f3dc1c0200b720679c6645ac8a06c757fe | |
| parent | 58079ae53aed9f5a46adb52c1275f2fb435d6ee2 (diff) | |
| download | chromium_src-962d46c393b425ba908d1e9d56eb711049a9a698.zip chromium_src-962d46c393b425ba908d1e9d56eb711049a9a698.tar.gz chromium_src-962d46c393b425ba908d1e9d56eb711049a9a698.tar.bz2 | |
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
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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); } |