Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h |
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h |
index 7e972cc62c636e6730ba9a671235ea76d5825b09..e81c4be81f5920fae0d8988e9ad0d7bb8084ee08 100644 |
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h |
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h |
@@ -42,6 +42,7 @@ |
#include "wtf/text/StringHash.h" |
#include "wtf/text/TextPosition.h" |
#include "wtf/text/WTFString.h" |
+ |
#include <memory> |
#include <utility> |
@@ -57,7 +58,7 @@ class CSPDirectiveList; |
class CSPSource; |
class Document; |
class Element; |
-class FrameLoaderClient; |
+class LocalFrameClient; |
class KURL; |
class ResourceRequest; |
class SecurityOrigin; |
@@ -67,6 +68,8 @@ typedef int SandboxFlags; |
typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector; |
typedef HeapVector<Member<ConsoleMessage>> ConsoleMessageVector; |
typedef std::pair<String, ContentSecurityPolicyHeaderType> CSPHeaderAndType; |
+// TODO(slangley): Remove this once references to FrameLoaderClient are removed. |
+using FrameLoaderClient = LocalFrameClient; |
haraken
2017/02/24 02:26:06
It looks strange that this using statement is writ
haraken
2017/02/24 02:26:06
Yes, new code in Blink prefers using than typedef.
|
using RedirectStatus = ResourceRequest::RedirectStatus; |
class CORE_EXPORT ContentSecurityPolicy |