Index: extensions/common/manifest_constants.cc |
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc |
index 40b7d4e870f85eaab30526a3ca5fef9cca8971f2..456518452debc6635795a043b8c2997c5d67435e 100644 |
--- a/extensions/common/manifest_constants.cc |
+++ b/extensions/common/manifest_constants.cc |
@@ -314,10 +314,15 @@ const char kInvalidContentPackSites[] = |
"Invalid value for Content Pack sites - files must be strings."; |
const char kInvalidContentScript[] = |
"Invalid value for 'content_scripts[*]'."; |
-const char kInvalidContentSecurityPolicy[] = |
- "Invalid value for 'content_security_policy'."; |
const char kInvalidContentScriptsList[] = |
"Invalid value for 'content_scripts'."; |
+const char kInvalidContentSecurityPolicy[] = |
+ "Invalid value for 'content_security_policy'."; |
+const char kInvalidCSPInsecureValue[] = |
+ "Ignored insecure CSP value \"*\" in directive '*'."; |
+const char kInvalidCSPMissingSecureSrc[] = |
+ "CSP directive '*' must be specified (either explicitly, or implicitly via" |
+ " 'default-src') and must whitelist only secure resources."; |
const char kInvalidCss[] = |
"Invalid value for 'content_scripts[*].css[*]'."; |
const char kInvalidCssList[] = |
@@ -627,14 +632,6 @@ const char kInvalidWebURLs[] = |
"Invalid value for 'app.urls'."; |
const char kInvalidZipHash[] = |
"Required key 'zip_hash' is missing or invalid."; |
-const char kInsecureContentSecurityPolicy[] = |
- "Invalid value for 'content_security_policy': Both 'script-src' and" |
- " 'object-src' directives must be specified (either explicitly, or" |
- " implicitly via 'default-src'), and both must whitelist only secure" |
- " resources. You may include any of the following sources: \"'self'\"," |
- " \"'unsafe-eval'\", \"http://127.0.0.1\", \"http://localhost\", or any" |
- " \"https://\" or \"chrome-extension://\" origin. For more information," |
- " see http://developer.chrome.com/extensions/contentSecurityPolicy.html"; |
const char kKeyIsDeprecatedWithReplacement[] = |
"Key \"*\" is deprecated. Key \"*\" should be used instead."; |
const char kLauncherPagePageRequired[] = |