| Index: third_party/WebKit/public/platform/WebMixedContent.h
|
| diff --git a/third_party/WebKit/public/platform/WebMixedContent.h b/third_party/WebKit/public/platform/WebMixedContent.h
|
| index e263e5c2c8b931f4c7a59a56727c25b768ffc3fe..c8596ebbd3f158f302307a2d5651db57974f823f 100644
|
| --- a/third_party/WebKit/public/platform/WebMixedContent.h
|
| +++ b/third_party/WebKit/public/platform/WebMixedContent.h
|
| @@ -31,26 +31,17 @@
|
| #ifndef WebMixedContent_h
|
| #define WebMixedContent_h
|
|
|
| +#include "public/platform/WebMixedContentContextType.h"
|
| #include "public/platform/WebURLRequest.h"
|
|
|
| namespace blink {
|
|
|
| -// Types and helper functions related to mixed content checks.
|
| +// Helper functions related to mixed content checks.
|
| class WebMixedContent {
|
| public:
|
| - enum class ContextType {
|
| - NotMixedContent,
|
| - Blockable,
|
| - OptionallyBlockable,
|
| - ShouldBeBlockable,
|
| - };
|
| -
|
| - BLINK_PLATFORM_EXPORT static ContextType contextTypeFromRequestContext(
|
| - WebURLRequest::RequestContext,
|
| - bool strictMixedContentCheckingForPlugin);
|
| -
|
| - BLINK_PLATFORM_EXPORT static const char* requestContextName(
|
| - WebURLRequest::RequestContext);
|
| + BLINK_PLATFORM_EXPORT static WebMixedContentContextType
|
| + contextTypeFromRequestContext(WebURLRequest::RequestContext,
|
| + bool strictMixedContentCheckingForPlugin);
|
| };
|
|
|
| } // namespace blink
|
|
|