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

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

Issue 2050553003: Moves Blink mixed content enums and helper methods to public. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor updates. Created 4 years, 6 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.h
diff --git a/third_party/WebKit/Source/core/loader/MixedContentChecker.h b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
index fa643a198ab843428831db826557d9d51ae2633d..01818964648b99fa80ecdde6bb44cb0b90b426ad 100644
--- a/third_party/WebKit/Source/core/loader/MixedContentChecker.h
+++ b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
@@ -35,6 +35,7 @@
#include "core/CoreExport.h"
#include "platform/heap/Handle.h"
#include "platform/network/ResourceRequest.h"
+#include "public/platform/WebMixedContent.h"
#include "public/platform/WebURLRequest.h"
#include "wtf/text/WTFString.h"
@@ -51,13 +52,6 @@ class CORE_EXPORT MixedContentChecker final {
WTF_MAKE_NONCOPYABLE(MixedContentChecker);
DISALLOW_NEW();
public:
- enum ContextType {
- ContextTypeNotMixedContent,
- ContextTypeBlockable,
- ContextTypeOptionallyBlockable,
- ContextTypeShouldBeBlockable,
- };
-
enum ReportingStatus { SendReport, SuppressReport };
static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, ResourceRequest::RedirectStatus, const KURL&, ReportingStatus = SendReport);
static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& request, const KURL& url, ReportingStatus status = SendReport)
@@ -72,7 +66,7 @@ public:
static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourceIPAddress);
- static ContextType contextTypeForInspector(LocalFrame*, const ResourceRequest&);
+ static WebMixedContent::ContextType contextTypeForInspector(LocalFrame*, const ResourceRequest&);
// Returns the frame that should be considered the effective frame
// for a mixed content check for the given frame type.
@@ -82,17 +76,9 @@ public:
private:
FRIEND_TEST_ALL_PREFIXES(MixedContentCheckerTest, HandleCertificateError);
- enum MixedContentType {
- Display,
- Execution,
- WebSocket,
- Submission
- };
static Frame* inWhichFrameIsContentMixed(Frame*, WebURLRequest::FrameType, const KURL&);
- static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Frame*);
- static const char* typeNameFromContext(WebURLRequest::RequestContext);
static void logToConsoleAboutFetch(LocalFrame*, const KURL&, const KURL&, WebURLRequest::RequestContext, bool allowed);
static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, const KURL&, bool allowed);
static void count(Frame*, WebURLRequest::RequestContext);

Powered by Google App Engine
This is Rietveld 408576698