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

Unified Diff: chrome/renderer/content_settings_observer.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 | « chrome/common/pref_names.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/content_settings_observer.h
diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
index 319b2a8e44060e2d5db8ba634eba0913ef21cdcb..6da3a2962e9384c11f4e89889a03a3f32f1dadca 100644
--- a/chrome/renderer/content_settings_observer.h
+++ b/chrome/renderer/content_settings_observer.h
@@ -80,12 +80,11 @@ class ContentSettingsObserver
void didNotAllowPlugins() override;
void didNotAllowScript() override;
void didUseKeygen() override;
- bool allowDisplayingInsecureContent(bool allowed_per_settings,
- const blink::WebURL& url) override;
bool allowRunningInsecureContent(bool allowed_per_settings,
const blink::WebSecurityOrigin& context,
const blink::WebURL& url) override;
bool allowAutoplay(bool default_value) override;
+ void passiveInsecureContentFound(const blink::WebURL&) override;
private:
FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
@@ -133,7 +132,6 @@ class ContentSettingsObserver
#endif
// Insecure content may be permitted for the duration of this render view.
- bool allow_displaying_insecure_content_;
bool allow_running_insecure_content_;
// A pointer to content setting rules stored by the renderer. Normally, the
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698