third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h - Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3

Patch Set: get-names-4: Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/dom/Node.h ('K') | « third_party/WebKit/Source/core/frame/RemoteFrame.cpp ('k') | third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicyTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 18e8cfe6ff07b6f8726becc1a80c088d35a553e8..766d39652c1d51a999d6424eb2321e44c7a80321 100644

--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h

+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.h

@@ -248,7 +248,7 @@ public:

String evalDisabledErrorMessage() const;

void setInsecureRequestsPolicy(SecurityContext::InsecureRequestsPolicy);

- SecurityContext::InsecureRequestsPolicy insecureRequestsPolicy() const { return m_insecureRequestsPolicy; }

+ SecurityContext::InsecureRequestsPolicy getInsecureRequestsPolicy() const { return m_insecureRequestsPolicy; }

bool urlMatchesSelf(const KURL&) const;

bool protocolMatchesSelf(const KURL&) const;