Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/content_settings_observer.h ('k') | components/test_runner/layout_test_runtime_flags.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer.cc
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 63d772f4143f6b7ec9602ed1dc4790889896ff82..8bd0430b15b7f9d5a016f7fbce3a8d4e4dc0da13 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -389,15 +389,6 @@ bool ContentSettingsObserver::allowMutationEvents(bool default_value) {
return IsPlatformApp() ? false : default_value;
}
-bool ContentSettingsObserver::allowDisplayingInsecureContent(
- bool allowed_per_settings,
- const blink::WebURL& resource_url) {
- DCHECK(allowed_per_settings);
- ReportInsecureContent(SslInsecureContentType::DISPLAY);
- FilteredReportInsecureContentDisplayed(GURL(resource_url));
- return true;
-}
-
bool ContentSettingsObserver::allowRunningInsecureContent(
bool allowed_per_settings,
const blink::WebSecurityOrigin& origin,
@@ -424,6 +415,12 @@ bool ContentSettingsObserver::allowAutoplay(bool default_value) {
CONTENT_SETTING_ALLOW;
}
+void ContentSettingsObserver::passiveInsecureContentFound(
+ const blink::WebURL& resource_url) {
+ ReportInsecureContent(SslInsecureContentType::DISPLAY);
+ FilteredReportInsecureContentDisplayed(GURL(resource_url));
+}
+
void ContentSettingsObserver::didUseKeygen() {
WebFrame* frame = render_frame()->GetWebFrame();
Send(new ChromeViewHostMsg_DidUseKeygen(
« no previous file with comments | « chrome/renderer/content_settings_observer.h ('k') | components/test_runner/layout_test_runtime_flags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698