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..92ea98e7e6f7e3fd7002a3f2e6846e3c8ab3ec92 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" |
+ |
sashab
2017/02/24 00:27:09
Is this needed? If it was done automatically by gi
slangley
2017/02/24 00:39:46
on the last cl dcheng@ said there should be vertic
sashab
2017/02/24 00:44:31
Cool.
|
#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. |
+typedef LocalFrameClient FrameLoaderClient; |
using RedirectStatus = ResourceRequest::RedirectStatus; |
sashab
2017/02/24 00:27:09
Do we prefer typedef or using? I'd check with dche
slangley
2017/02/24 00:39:46
typedef is how to alias types, right?
sashab
2017/02/24 00:44:31
You can also use "using", which I think is the C++
|
class CORE_EXPORT ContentSecurityPolicy |