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

Unified Diff: third_party/WebKit/public/web/WebContentSettingsClient.h

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 | « third_party/WebKit/Source/web/WebSettingsImpl.cpp ('k') | third_party/WebKit/public/web/WebSettings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/public/web/WebContentSettingsClient.h
diff --git a/third_party/WebKit/public/web/WebContentSettingsClient.h b/third_party/WebKit/public/web/WebContentSettingsClient.h
index 9b71bb04415462042d4d42f6a25420adf4589352..d3b867d3d4002b77dc6268c5ad49445bcd591630 100644
--- a/third_party/WebKit/public/web/WebContentSettingsClient.h
+++ b/third_party/WebKit/public/web/WebContentSettingsClient.h
@@ -39,10 +39,7 @@ public:
// Controls whether scripts loaded from the given URL are allowed to execute for this frame.
virtual bool allowScriptFromSource(bool enabledPerSettings, const WebURL& scriptURL) { return enabledPerSettings; }
- // Controls whether insecrure content is allowed to display for this frame.
- virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, const WebURL&) { return enabledPerSettings; }
-
- // Controls whether insecrure scripts are allowed to execute for this frame.
+ // Controls whether insecure scripts are allowed to execute for this frame.
virtual bool allowRunningInsecureContent(bool enabledPerSettings, const WebSecurityOrigin&, const WebURL&) { return enabledPerSettings; }
// Controls whether the given script extension should run in a new script
@@ -78,6 +75,9 @@ public:
// Controls whether autoplay is allowed for this frame.
virtual bool allowAutoplay(bool defaultValue) { return defaultValue; }
+ // Reports that passive mixed content was found at the provided URL.
+ virtual void passiveInsecureContentFound(const WebURL&) {}
+
// Notifies the client that the frame would have instantiated a plugin if plugins were enabled.
virtual void didNotAllowPlugins() { }
« no previous file with comments | « third_party/WebKit/Source/web/WebSettingsImpl.cpp ('k') | third_party/WebKit/public/web/WebSettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698