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

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

Issue 246893014: Add a WebSettings item to turn off mixed content check for WebSocket (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 9f9f41c135cc8edac2d851dc5f55c6f5d2a038e4..9a80492d2ffedd2f0e84586545a20763973f4973 100644
--- a/Source/core/loader/MixedContentChecker.h
+++ b/Source/core/loader/MixedContentChecker.h
@@ -46,13 +46,22 @@ public:
MixedContentChecker(LocalFrame*);
bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const;
- bool canRunInsecureContent(SecurityOrigin*, const KURL&) const;
+ bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
+ {
+ return canRunInsecureContentInternal(securityOrigin, url, false);
+ }
+ bool canConnectInsecureWebSocket(SecurityOrigin* securityOrigin, const KURL& url) const
+ {
+ return canRunInsecureContentInternal(securityOrigin, url, true);
+ }
static bool isMixedContent(SecurityOrigin*, const KURL&);
private:
// FIXME: This should probably have a separate client from FrameLoader.
FrameLoaderClient* client() const;
+ bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, bool) const;
yhirano 2014/04/23 08:07:48 Can you name the boolean parameter?
tyoshino (SeeGerritForStatus) 2014/04/23 12:39:27 Done.
+
void logWarning(bool allowed, const String& action, const KURL&) const;
LocalFrame* m_frame;
@@ -61,4 +70,3 @@ private:
} // namespace WebCore
#endif // MixedContentChecker_h
-
« 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