Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h

Issue 2712033002: Part 1 Of Renaming FrameLoaderClient to LocalFrameClient. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google, Inc. All rights reserved. 2 * Copyright (C) 2011 Google, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 24 matching lines...) Expand all
35 #include "platform/loader/fetch/Resource.h" 35 #include "platform/loader/fetch/Resource.h"
36 #include "platform/network/ContentSecurityPolicyParsers.h" 36 #include "platform/network/ContentSecurityPolicyParsers.h"
37 #include "platform/network/HTTPParsers.h" 37 #include "platform/network/HTTPParsers.h"
38 #include "platform/network/ResourceRequest.h" 38 #include "platform/network/ResourceRequest.h"
39 #include "public/platform/WebInsecureRequestPolicy.h" 39 #include "public/platform/WebInsecureRequestPolicy.h"
40 #include "wtf/HashSet.h" 40 #include "wtf/HashSet.h"
41 #include "wtf/Vector.h" 41 #include "wtf/Vector.h"
42 #include "wtf/text/StringHash.h" 42 #include "wtf/text/StringHash.h"
43 #include "wtf/text/TextPosition.h" 43 #include "wtf/text/TextPosition.h"
44 #include "wtf/text/WTFString.h" 44 #include "wtf/text/WTFString.h"
45
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.
45 #include <memory> 46 #include <memory>
46 #include <utility> 47 #include <utility>
47 48
48 namespace WTF { 49 namespace WTF {
49 class OrdinalNumber; 50 class OrdinalNumber;
50 } 51 }
51 52
52 namespace blink { 53 namespace blink {
53 54
54 class ContentSecurityPolicyResponseHeaders; 55 class ContentSecurityPolicyResponseHeaders;
55 class ConsoleMessage; 56 class ConsoleMessage;
56 class CSPDirectiveList; 57 class CSPDirectiveList;
57 class CSPSource; 58 class CSPSource;
58 class Document; 59 class Document;
59 class Element; 60 class Element;
60 class FrameLoaderClient; 61 class LocalFrameClient;
61 class KURL; 62 class KURL;
62 class ResourceRequest; 63 class ResourceRequest;
63 class SecurityOrigin; 64 class SecurityOrigin;
64 class SecurityPolicyViolationEventInit; 65 class SecurityPolicyViolationEventInit;
65 66
66 typedef int SandboxFlags; 67 typedef int SandboxFlags;
67 typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector; 68 typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector;
68 typedef HeapVector<Member<ConsoleMessage>> ConsoleMessageVector; 69 typedef HeapVector<Member<ConsoleMessage>> ConsoleMessageVector;
69 typedef std::pair<String, ContentSecurityPolicyHeaderType> CSPHeaderAndType; 70 typedef std::pair<String, ContentSecurityPolicyHeaderType> CSPHeaderAndType;
71 // TODO(slangley): Remove this once references to FrameLoaderClient are removed.
72 typedef LocalFrameClient FrameLoaderClient;
70 using RedirectStatus = ResourceRequest::RedirectStatus; 73 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++
71 74
72 class CORE_EXPORT ContentSecurityPolicy 75 class CORE_EXPORT ContentSecurityPolicy
73 : public GarbageCollectedFinalized<ContentSecurityPolicy> { 76 : public GarbageCollectedFinalized<ContentSecurityPolicy> {
74 public: 77 public:
75 enum ReportingStatus { SendReport, SuppressReport }; 78 enum ReportingStatus { SendReport, SuppressReport };
76 79
77 enum ExceptionStatus { WillThrowException, WillNotThrowException }; 80 enum ExceptionStatus { WillThrowException, WillNotThrowException };
78 81
79 // This covers the possible values of a violation's 'resource', as defined in 82 // This covers the possible values of a violation's 'resource', as defined in
80 // https://w3c.github.io/webappsec-csp/#violation-resource. By the time we 83 // https://w3c.github.io/webappsec-csp/#violation-resource. By the time we
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 String m_disableEvalErrorMessage; 412 String m_disableEvalErrorMessage;
410 WebInsecureRequestPolicy m_insecureRequestPolicy; 413 WebInsecureRequestPolicy m_insecureRequestPolicy;
411 414
412 Member<CSPSource> m_selfSource; 415 Member<CSPSource> m_selfSource;
413 String m_selfProtocol; 416 String m_selfProtocol;
414 }; 417 };
415 418
416 } // namespace blink 419 } // namespace blink
417 420
418 #endif 421 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698