Index: third_party/WebKit/public/platform/WebMixedContent.h |
diff --git a/third_party/WebKit/public/platform/WebEffectiveConnectionType.h b/third_party/WebKit/public/platform/WebMixedContent.h |
similarity index 72% |
copy from third_party/WebKit/public/platform/WebEffectiveConnectionType.h |
copy to third_party/WebKit/public/platform/WebMixedContent.h |
index 648777e7bd1b0fcaf51a9a06d98f141795e988ab..7f6ec2c6be4ccb14de9055ba3dac471304c6e28e 100644 |
--- a/third_party/WebKit/public/platform/WebEffectiveConnectionType.h |
+++ b/third_party/WebKit/public/platform/WebMixedContent.h |
@@ -28,21 +28,28 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WebEffectiveConnectionType_h |
-#define WebEffectiveConnectionType_h |
+#ifndef WebMixedContent_h |
+#define WebMixedContent_h |
+ |
+#include "public/platform/WebURLRequest.h" |
namespace blink { |
-enum class WebEffectiveConnectionType { |
- TypeUnknown, |
- TypeOffline, |
- TypeSlow2G, |
- Type2G, |
- Type3G, |
- Type4G, |
- TypeBroadband |
+// Types and 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); |
}; |
} // namespace blink |
-#endif // WebEffectiveConnectionType_h |
+#endif // WebMixedContent_h |