chrome/common/extensions/csp_validator.h - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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: chrome/common/extensions/csp_validator.h

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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

« chrome/browser/extensions/tab_helper.h ('K') | « chrome/common/extensions/api/extension_api_unittest.cc ('k') | chrome/common/extensions/csp_validator.cc » ('j') | chrome/common/extensions/extension.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/csp_validator.h

diff --git a/chrome/common/extensions/csp_validator.h b/chrome/common/extensions/csp_validator.h

index 1934495542590864213d534efe64c21006e8eac7..db15e365b2ff55ccd473f0ea9b25e92542b1d8ed 100644

--- a/chrome/common/extensions/csp_validator.h

+++ b/chrome/common/extensions/csp_validator.h

@@ -8,6 +8,7 @@

#include <string>

#include "chrome/common/extensions/extension.h"

+#include "chrome/common/extensions/manifest.h"

namespace extensions {

@@ -29,7 +30,7 @@ bool ContentSecurityPolicyIsLegal(const std::string& policy);

// 'unsafe-eval' in the script-src directive, so that is allowed as a special

// case for extensions. Platform apps disallow it.

bool ContentSecurityPolicyIsSecure(

- const std::string& policy, Extension::Type type);

+ const std::string& policy, Manifest::Type type);

// Checks whether the given |policy| enforces a unique origin sandbox as

// defined by http://www.whatwg.org/specs/web-apps/current-work/multipage/

@@ -38,7 +39,7 @@ bool ContentSecurityPolicyIsSecure(

// "allow-same-origin". Additional restrictions may be imposed depending on

// |type|.

bool ContentSecurityPolicyIsSandboxed(

- const std::string& policy, Extension::Type type);

+ const std::string& policy, Manifest::Type type);

} // namespace csp_validator