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

Unified Diff: third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Cleanup before adding reviewers. Created 4 years, 4 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
Index: third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
diff --git a/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp b/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
index 639a7fd273737b48434ac3b0496d3774e76f56d4..1b46299fa7ce7f7c464ed899fee268b553f18f51 100644
--- a/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
+++ b/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp
@@ -217,7 +217,8 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, WebURLRequest::Req
switch (contextType) {
case WebMixedContent::ContextType::OptionallyBlockable:
- allowed = !strictMode && client->allowDisplayingInsecureContent(settings && settings->allowDisplayOfInsecureContent(), url);
+ client->passiveInsecureContentFound(url);
Mike West 2016/08/31 09:46:51 It looks like `ContentSettingsObserver::passiveIns
carlosk 2016/09/02 23:47:42 ContentSettingsObserver::passiveInsecureContentFou
Mike West 2016/09/05 10:01:51 Got it, thanks for the explanation. Blink LGTM.
+ allowed = !strictMode;
if (allowed)
client->didDisplayInsecureContent();
break;

Powered by Google App Engine
This is Rietveld 408576698