| Index: extensions/common/manifest_constants.cc
|
| diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
|
| index ce02109d7480d589c765ab0413f4b369888a75f5..fa1ade80db1cfb1692061475021fec9bdf918516 100644
|
| --- a/extensions/common/manifest_constants.cc
|
| +++ b/extensions/common/manifest_constants.cc
|
| @@ -308,10 +308,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[] =
|
| @@ -622,14 +627,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[] =
|
|
|