Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 01a810115cad34d45f09f089116e46209c11b174..73a3a9d0ca3df8d690217e45889bf9ef3eea88e1 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -3550,6 +3550,10 @@ void WebContentsImpl::OnDidLoadResourceFromMemoryCache( |
void WebContentsImpl::OnDidDisplayInsecureContent(RenderFrameHostImpl* source) { |
// Any frame can trigger display of insecure content, so we don't check |
// |source| here. |
+ DidDisplayInsecureContent(); |
+} |
+ |
+void WebContentsImpl::DidDisplayInsecureContent() { |
controller_.ssl_manager()->DidDisplayMixedContent(); |
} |
@@ -3559,6 +3563,11 @@ void WebContentsImpl::OnDidRunInsecureContent(RenderFrameHostImpl* source, |
// TODO(nick, estark): Should we call FilterURL using |source|'s process on |
// these parameters? |target_url| seems unused, except for a log message. And |
// |security_origin| might be replaceable with the origin of the main frame. |
+ DidRunInsecureContent(security_origin, target_url); |
+} |
+ |
+void WebContentsImpl::DidRunInsecureContent(const GURL& security_origin, |
+ const GURL& target_url) { |
nasko
2017/02/10 01:08:21
Huh, we pass target_url just for logging?!
carlosk
2017/02/11 01:40:22
Yes but a) this is the current behavior and b) see
|
LOG(WARNING) << security_origin << " ran insecure content from " |
<< target_url.possibly_invalid_spec(); |
RecordAction(base::UserMetricsAction("SSL.RanInsecureContent")); |
@@ -3568,6 +3577,19 @@ void WebContentsImpl::OnDidRunInsecureContent(RenderFrameHostImpl* source, |
controller_.ssl_manager()->DidRunMixedContent(security_origin); |
} |
+void WebContentsImpl::PassiveInsecureContentFound(const GURL& resource_url) { |
+ GetDelegate()->PassiveInsecureContentFound(resource_url); |
+} |
+ |
+bool WebContentsImpl::ShouldAllowRunningInsecureContent( |
+ WebContents* web_contents, |
+ bool allowed_per_prefs, |
+ const url::Origin& origin, |
+ const GURL& resource_url) { |
+ return GetDelegate()->ShouldAllowRunningInsecureContent( |
+ web_contents, allowed_per_prefs, origin, resource_url); |
+} |
+ |
void WebContentsImpl::OnDidDisplayContentWithCertificateErrors( |
RenderFrameHostImpl* source, |
const GURL& url) { |