diff options
| -rw-r--r-- | chrome/common/extensions/extension.cc | 3 | ||||
| -rw-r--r-- | chrome/common/extensions/extension_constants.cc | 2 | ||||
| -rw-r--r-- | chrome/common/extensions/extension_constants.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index d07ba80..7b39253 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -253,8 +253,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script, // was provided. if (!CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableJsOnFileUrls)) { - *error = errors::kInvalidJsMatches; - return false; + continue; } } diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index fc16fea..733b4f8 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -91,8 +91,6 @@ const char* kInvalidJs = "Invalid value for 'content_scripts[*].js[*]'."; const char* kInvalidJsList = "Required value 'content_scripts[*].js is invalid."; -const char* kInvalidJsMatches = - "Content scripts can not be executed on file:// urls."; const char* kInvalidKey = "Value 'key' is missing or invalid."; const char* kInvalidManifest = diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h index b0765b4..c8a717a 100644 --- a/chrome/common/extensions/extension_constants.h +++ b/chrome/common/extensions/extension_constants.h @@ -77,7 +77,6 @@ namespace extension_manifest_errors { extern const char* kInvalidGlob; extern const char* kInvalidJs; extern const char* kInvalidJsList; - extern const char* kInvalidJsMatches; extern const char* kInvalidKey; extern const char* kInvalidManifest; extern const char* kInvalidMatchCount; |