Chromium Code Reviews| Index: Source/core/loader/MixedContentChecker.h |
| diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h |
| index b4eb49a7585b5678ddcab791421c72a1f848fd1f..917f76fe3d87ec230af843b2070f2db61999509e 100644 |
| --- a/Source/core/loader/MixedContentChecker.h |
| +++ b/Source/core/loader/MixedContentChecker.h |
| @@ -45,7 +45,15 @@ class MixedContentChecker { |
| public: |
| MixedContentChecker(LocalFrame*); |
| - bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const; |
| + bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const |
| + { |
| + return canDisplayInsecureContentInternal(securityOrigin, url, false); |
| + } |
| + bool canSubmitToInsecureForm(SecurityOrigin* securityOrigin, const KURL& url) const |
| + { |
| + return canDisplayInsecureContentInternal(securityOrigin, url, true); |
| + } |
| + |
|
jww
2014/06/05 23:00:49
Seems like you added an extra space here.
|
| bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const |
| { |
| return canRunInsecureContentInternal(securityOrigin, url, false); |
| @@ -60,9 +68,11 @@ private: |
| // FIXME: This should probably have a separate client from FrameLoader. |
| FrameLoaderClient* client() const; |
| + bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, bool isForm) const; |
| + |
| bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, bool isWebSocket) const; |
| - void logWarning(bool allowed, const String& action, const KURL&) const; |
| + void logWarning(bool allowed, const String& action1, const String& action2, const KURL&) const; |
| LocalFrame* m_frame; |
| }; |