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

Unified Diff: Source/core/loader/MixedContentChecker.h

Issue 1265953002: Appease jschuh@ by adding a setting to move 'plugin' to blockable mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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 | « Source/core/frame/Settings.in ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/MixedContentChecker.h
diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
index 200e35ba253bb9cb5d1cb43807a85a5864c00596..f324a02ace2c06d4f5cdcca051ec72338ac63311 100644
--- a/Source/core/loader/MixedContentChecker.h
+++ b/Source/core/loader/MixedContentChecker.h
@@ -78,7 +78,7 @@ private:
static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::FrameType, const KURL&);
- static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
+ static ContextType contextTypeFromContext(WebURLRequest::RequestContext, LocalFrame*);
static const char* typeNameFromContext(WebURLRequest::RequestContext);
static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowed);
« no previous file with comments | « Source/core/frame/Settings.in ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698