Commit 997e87d1 authored by cevans@chromium.org's avatar cevans@chromium.org

Show the mixed content shield UI even for HSTS hosts.

The user deserves a chance to override. Now that we've made the UI subtle,
it's not like users are going to hit the button by accident.

BUG=285376
R=thestig@chromium.org, tsepez@chromium.org

Review URL: https://codereview.chromium.org/23971005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221355 0039d316-1c4b-4281-b951-d872f2087c98
parent 5b85448d
...@@ -673,8 +673,7 @@ bool ChromeRenderViewObserver::allowDisplayingInsecureContent( ...@@ -673,8 +673,7 @@ bool ChromeRenderViewObserver::allowDisplayingInsecureContent(
if (allowed_per_settings || allow_displaying_insecure_content_) if (allowed_per_settings || allow_displaying_insecure_content_)
return true; return true;
if (!IsStrictSecurityHost(origin_host)) Send(new ChromeViewHostMsg_DidBlockDisplayingInsecureContent(routing_id()));
Send(new ChromeViewHostMsg_DidBlockDisplayingInsecureContent(routing_id()));
return false; return false;
} }
...@@ -738,8 +737,7 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent( ...@@ -738,8 +737,7 @@ bool ChromeRenderViewObserver::allowRunningInsecureContent(
SendInsecureContentSignal(INSECURE_CONTENT_RUN_SWF); SendInsecureContentSignal(INSECURE_CONTENT_RUN_SWF);
if (!allow_running_insecure_content_ && !allowed_per_settings) { if (!allow_running_insecure_content_ && !allowed_per_settings) {
if (!IsStrictSecurityHost(origin_host)) content_settings_->DidNotAllowMixedScript();
content_settings_->DidNotAllowMixedScript();
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment