Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8308)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: hate Created 8 years, 1 month 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
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_error_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index bcd68065809d98c572eb949498c861f76ccb44d9..b7eb0890305a983cd865286418866b32b10d300e 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -27,7 +27,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/csp_validator.h"
-#include "chrome/common/extensions/extension_error_utils.h"
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/extensions/feature_switch.h"
@@ -37,11 +36,12 @@
#include "chrome/common/extensions/manifest.h"
#include "chrome/common/extensions/permissions/permission_set.h"
#include "chrome/common/extensions/permissions/permissions_info.h"
-#include "chrome/common/extensions/url_pattern_set.h"
#include "chrome/common/extensions/user_script.h"
#include "chrome/common/url_constants.h"
#include "crypto/sha2.h"
#include "extensions/common/constants.h"
+#include "extensions/common/error_utils.h"
+#include "extensions/common/url_pattern_set.h"
#include "googleurl/src/url_util.h"
#include "grit/chromium_strings.h"
#include "grit/theme_resources.h"
@@ -157,13 +157,13 @@ bool LoadIconsFromDictionary(const DictionaryValue* icons_value,
if (icons_value->HasKey(key)) {
std::string icon_path;
if (!icons_value->GetString(key, &icon_path)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIconPath, key);
return false;
}
if (!NormalizeAndValidatePath(&icon_path)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIconPath, key);
return false;
}
@@ -265,14 +265,14 @@ bool ReadLaunchDimension(const extensions::Manifest* manifest,
Value* temp = NULL;
if (manifest->Get(key, &temp)) {
if (!is_valid_container) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValueContainer,
key);
return false;
}
if (!temp->GetAsInteger(target) || *target < 0) {
*target = 0;
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
key);
return false;
@@ -610,7 +610,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
if (content_script->HasKey(keys::kRunAt)) {
std::string run_location;
if (!content_script->GetString(keys::kRunAt, &run_location)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRunAt,
base::IntToString(definition_index));
return false;
@@ -623,7 +623,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
} else if (run_location == values::kRunAtDocumentIdle) {
result->set_run_location(UserScript::DOCUMENT_IDLE);
} else {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRunAt,
base::IntToString(definition_index));
return false;
@@ -634,7 +634,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
if (content_script->HasKey(keys::kAllFrames)) {
bool all_frames = false;
if (!content_script->GetBoolean(keys::kAllFrames, &all_frames)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidAllFrames, base::IntToString(definition_index));
return false;
}
@@ -644,14 +644,14 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
// matches (required)
const ListValue* matches = NULL;
if (!content_script->GetList(keys::kMatches, &matches)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidMatches,
base::IntToString(definition_index));
return false;
}
if (matches->GetSize() == 0) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidMatchCount,
base::IntToString(definition_index));
return false;
@@ -659,7 +659,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
for (size_t j = 0; j < matches->GetSize(); ++j) {
std::string match_str;
if (!matches->GetString(j, &match_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidMatch,
base::IntToString(definition_index),
base::IntToString(j),
@@ -673,7 +673,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
URLPattern::ParseResult parse_result = pattern.Parse(match_str);
if (parse_result != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidMatch,
base::IntToString(definition_index),
base::IntToString(j),
@@ -697,7 +697,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
if (content_script->HasKey(keys::kExcludeMatches)) { // optional
const ListValue* exclude_matches = NULL;
if (!content_script->GetList(keys::kExcludeMatches, &exclude_matches)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidExcludeMatches,
base::IntToString(definition_index));
return false;
@@ -706,7 +706,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
for (size_t j = 0; j < exclude_matches->GetSize(); ++j) {
std::string match_str;
if (!exclude_matches->GetString(j, &match_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidExcludeMatch,
base::IntToString(definition_index),
base::IntToString(j),
@@ -719,7 +719,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
pattern.SetValidSchemes(URLPattern::SCHEME_ALL);
URLPattern::ParseResult parse_result = pattern.Parse(match_str);
if (parse_result != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidExcludeMatch,
base::IntToString(definition_index), base::IntToString(j),
URLPattern::GetParseResultString(parse_result));
@@ -745,7 +745,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
const ListValue* js = NULL;
if (content_script->HasKey(keys::kJs) &&
!content_script->GetList(keys::kJs, &js)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidJsList,
base::IntToString(definition_index));
return false;
@@ -754,7 +754,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
const ListValue* css = NULL;
if (content_script->HasKey(keys::kCss) &&
!content_script->GetList(keys::kCss, &css)) {
- *error = ExtensionErrorUtils::
+ *error = ErrorUtils::
FormatErrorMessageUTF16(errors::kInvalidCssList,
base::IntToString(definition_index));
return false;
@@ -762,7 +762,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
// The manifest needs to have at least one js or css user script definition.
if (((js ? js->GetSize() : 0) + (css ? css->GetSize() : 0)) == 0) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kMissingFile,
base::IntToString(definition_index));
return false;
@@ -774,7 +774,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
const Value* value;
std::string relative;
if (!js->Get(script_index, &value) || !value->GetAsString(&relative)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidJs,
base::IntToString(definition_index),
base::IntToString(script_index));
@@ -793,7 +793,7 @@ bool Extension::LoadUserScriptHelper(const DictionaryValue* content_script,
const Value* value;
std::string relative;
if (!css->Get(script_index, &value) || !value->GetAsString(&relative)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidCss,
base::IntToString(definition_index),
base::IntToString(script_index));
@@ -821,7 +821,7 @@ bool Extension::LoadGlobsHelper(
const ListValue* list = NULL;
if (!content_script->GetList(globs_property_name, &list)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidGlobList,
base::IntToString(content_script_index),
globs_property_name);
@@ -831,7 +831,7 @@ bool Extension::LoadGlobsHelper(
for (size_t i = 0; i < list->GetSize(); ++i) {
std::string glob;
if (!list->GetString(i, &glob)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidGlob,
base::IntToString(content_script_index),
globs_property_name,
@@ -929,7 +929,7 @@ scoped_ptr<Extension::ActionInfo> Extension::LoadExtensionActionInfoHelper(
if (manifest_version_ == 1 &&
extension_action->HasKey(keys::kPageActionPopup)) {
if (popup_key) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPageActionOldAndNewKeys,
keys::kPageActionDefaultPopup,
keys::kPageActionPopup);
@@ -947,7 +947,7 @@ scoped_ptr<Extension::ActionInfo> Extension::LoadExtensionActionInfoHelper(
} else if (manifest_version_ == 1 &&
extension_action->GetDictionary(popup_key, &popup)) {
if (!popup->GetString(keys::kPageActionPopupPath, &url_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPageActionPopupPath, "<missing>");
return scoped_ptr<ActionInfo>();
}
@@ -960,7 +960,7 @@ scoped_ptr<Extension::ActionInfo> Extension::LoadExtensionActionInfoHelper(
// An empty string is treated as having no popup.
result->default_popup_url = GetResourceURL(url_str);
if (!result->default_popup_url.is_valid()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPageActionPopupPath, url_str);
return scoped_ptr<ActionInfo>();
}
@@ -1114,7 +1114,7 @@ bool Extension::LoadExtent(const char* key,
for (size_t i = 0; i < pattern_list->GetSize(); ++i) {
std::string pattern_string;
if (!pattern_list->GetString(i, &pattern_string)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(value_error,
+ *error = ErrorUtils::FormatErrorMessageUTF16(value_error,
base::UintToString(i),
errors::kExpectString);
return false;
@@ -1128,7 +1128,7 @@ bool Extension::LoadExtent(const char* key,
}
if (parse_result != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
value_error,
base::UintToString(i),
URLPattern::GetParseResultString(parse_result));
@@ -1137,7 +1137,7 @@ bool Extension::LoadExtent(const char* key,
// Do not allow authors to claim "<all_urls>".
if (pattern.match_all_urls()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
value_error,
base::UintToString(i),
errors::kCannotClaimAllURLsInExtent);
@@ -1146,7 +1146,7 @@ bool Extension::LoadExtent(const char* key,
// Do not allow authors to claim "*" for host.
if (pattern.host().empty()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
value_error,
base::UintToString(i),
errors::kCannotClaimAllHostsInExtent);
@@ -1156,7 +1156,7 @@ bool Extension::LoadExtent(const char* key,
// We do not allow authors to put wildcards in their paths. Instead, we
// imply one at the end.
if (pattern.path().find('*') != std::string::npos) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
value_error,
base::UintToString(i),
errors::kNoWildCardsInPaths);
@@ -1188,7 +1188,7 @@ bool Extension::LoadLaunchURL(string16* error) {
std::string launch_path;
if (!temp->GetAsString(&launch_path)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
keys::kLaunchLocalPath);
return false;
@@ -1197,7 +1197,7 @@ bool Extension::LoadLaunchURL(string16* error) {
// Ensure the launch path is a valid relative URL.
GURL resolved = url().Resolve(launch_path);
if (!resolved.is_valid() || resolved.GetOrigin() != url()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
keys::kLaunchLocalPath);
return false;
@@ -1207,7 +1207,7 @@ bool Extension::LoadLaunchURL(string16* error) {
} else if (manifest_->Get(keys::kLaunchWebURL, &temp)) {
std::string launch_url;
if (!temp->GetAsString(&launch_url)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
keys::kLaunchWebURL);
return false;
@@ -1217,7 +1217,7 @@ bool Extension::LoadLaunchURL(string16* error) {
GURL url(launch_url);
URLPattern pattern(kValidWebExtentSchemes);
if (!url.is_valid() || !pattern.SetScheme(url.scheme())) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
keys::kLaunchWebURL);
return false;
@@ -1234,7 +1234,7 @@ bool Extension::LoadLaunchURL(string16* error) {
GURL launch_url(launch_web_url());
URLPattern pattern(kValidWebExtentSchemes);
if (!pattern.SetScheme("*")) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidLaunchValue,
keys::kLaunchWebURL);
return false;
@@ -1386,7 +1386,7 @@ bool Extension::LoadManifestVersion(string16* error) {
manifest_version_ < kModernManifestVersion &&
!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAllowLegacyExtensionManifests)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidManifestVersionOld,
base::IntToString(kModernManifestVersion));
return false;
@@ -1400,7 +1400,7 @@ bool Extension::LoadHomepageURL(string16* error) {
return true;
std::string tmp_homepage_url;
if (!manifest_->GetString(keys::kHomepageURL, &tmp_homepage_url)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidHomepageURL, "");
return false;
}
@@ -1408,7 +1408,7 @@ bool Extension::LoadHomepageURL(string16* error) {
if (!homepage_url_.is_valid() ||
(!homepage_url_.SchemeIs("http") &&
!homepage_url_.SchemeIs("https"))) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidHomepageURL, tmp_homepage_url);
return false;
}
@@ -1420,14 +1420,14 @@ bool Extension::LoadUpdateURL(string16* error) {
return true;
std::string tmp_update_url;
if (!manifest_->GetString(keys::kUpdateURL, &tmp_update_url)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidUpdateURL, "");
return false;
}
update_url_ = GURL(tmp_update_url);
if (!update_url_.is_valid() ||
update_url_.has_ref()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidUpdateURL, tmp_update_url);
return false;
}
@@ -1459,7 +1459,7 @@ bool Extension::LoadCommands(string16* error) {
}
if (commands->size() > kMaxCommandsPerExtension) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidKeyBindingTooMany,
base::IntToString(kMaxCommandsPerExtension));
return false;
@@ -1472,7 +1472,7 @@ bool Extension::LoadCommands(string16* error) {
DictionaryValue* command = NULL;
if (!commands->GetDictionary(*iter, &command)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidKeyBindingDictionary,
base::IntToString(command_index));
return false;
@@ -1528,7 +1528,7 @@ bool Extension::LoadPlugins(string16* error) {
// Get plugins[i].path.
std::string path_str;
if (!plugin_value->GetString(keys::kPluginsPath, &path_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPluginsPath, base::IntToString(i));
return false;
}
@@ -1537,7 +1537,7 @@ bool Extension::LoadPlugins(string16* error) {
bool is_public = false;
if (plugin_value->HasKey(keys::kPluginsPublic)) {
if (!plugin_value->GetBoolean(keys::kPluginsPublic, &is_public)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPluginsPublic, base::IntToString(i));
return false;
}
@@ -1580,7 +1580,7 @@ bool Extension::LoadNaClModules(string16* error) {
// Get nacl_modules[i].path.
std::string path_str;
if (!module_value->GetString(keys::kNaClModulesPath, &path_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidNaClModulesPath, base::IntToString(i));
return false;
}
@@ -1588,7 +1588,7 @@ bool Extension::LoadNaClModules(string16* error) {
// Get nacl_modules[i].mime_type.
std::string mime_type;
if (!module_value->GetString(keys::kNaClModulesMIMEType, &mime_type)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidNaClModulesMIMEType, base::IntToString(i));
return false;
}
@@ -1612,13 +1612,13 @@ bool Extension::LoadWebAccessibleResources(string16* error) {
for (size_t i = 0; i < list_value->GetSize(); ++i) {
std::string relative_path;
if (!list_value->GetString(i, &relative_path)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidWebAccessibleResource, base::IntToString(i));
return false;
}
URLPattern pattern(URLPattern::SCHEME_EXTENSION);
if (pattern.Parse(extension_url_.spec()) != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, extension_url_.spec());
return false;
}
@@ -1643,13 +1643,13 @@ bool Extension::LoadSandboxedPages(string16* error) {
for (size_t i = 0; i < list_value->GetSize(); ++i) {
std::string relative_path;
if (!list_value->GetString(i, &relative_path)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidSandboxedPage, base::IntToString(i));
return false;
}
URLPattern pattern(URLPattern::SCHEME_EXTENSION);
if (pattern.Parse(extension_url_.spec()) != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, extension_url_.spec());
return false;
}
@@ -1704,7 +1704,7 @@ bool Extension::LoadRequirements(string16* error) {
DictionaryValue* requirement_value;
if (!requirements_value->GetDictionaryWithoutPathExpansion(
*it, &requirement_value)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRequirement, *it);
return false;
}
@@ -1715,14 +1715,14 @@ bool Extension::LoadRequirements(string16* error) {
plugin_it != requirement_value->end_keys(); ++plugin_it) {
bool plugin_required = false;
if (!requirement_value->GetBoolean(*plugin_it, &plugin_required)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRequirement, *it);
return false;
}
if (*plugin_it == "npapi") {
requirements_.npapi = plugin_required;
} else {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRequirement, *it);
return false;
}
@@ -1732,7 +1732,7 @@ bool Extension::LoadRequirements(string16* error) {
if (!requirement_value->GetListWithoutPathExpansion("features",
&features) ||
!features) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRequirement, *it);
return false;
}
@@ -1747,7 +1747,7 @@ bool Extension::LoadRequirements(string16* error) {
} else if (feature == "css3d") {
requirements_.css3d = true;
} else {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidRequirement, *it);
return false;
}
@@ -1841,7 +1841,7 @@ bool Extension::LoadBackgroundScripts(const std::string& key, string16* error) {
for (size_t i = 0; i < background_scripts->GetSize(); ++i) {
std::string script;
if (!background_scripts->GetString(i, &script)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidBackgroundScript, base::IntToString(i));
return false;
}
@@ -1970,7 +1970,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
if (!intent_service.HasKey(keys::kIntentType) ||
!intent_service.GetList(keys::kIntentType, &mime_types) ||
mime_types->GetSize() == 0) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentType, action_name);
return false;
}
@@ -1985,7 +1985,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
if (intent_service.HasKey(keys::kIntentHref)) {
if (!href.empty()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentHrefOldAndNewKey, action_name,
keys::kIntentPath, keys::kIntentHref);
return false;
@@ -2008,11 +2008,11 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
// If there still is not an href, the manifest is malformed, unless this is a
// platform app in which case the href should not be present.
if (href.empty() && !is_platform_app()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentHrefEmpty, action_name);
return false;
} else if (!href.empty() && is_platform_app()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentHrefInPlatformApp, action_name);
return false;
}
@@ -2022,7 +2022,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
// Hosted apps require an absolute URL for intents.
if (!service_url.is_valid() ||
!(web_extent().MatchesURL(service_url))) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentPageInHostedApp, action_name);
return false;
}
@@ -2032,7 +2032,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
} else {
// We do not allow absolute intent URLs in non-hosted apps.
if (service_url.is_valid()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kCannotAccessPage, href);
return false;
}
@@ -2047,7 +2047,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
if (intent_service.HasKey(keys::kIntentDisposition)) {
if (is_platform_app()) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentDispositionInPlatformApp, action_name);
return false;
}
@@ -2068,7 +2068,7 @@ bool Extension::LoadWebIntentAction(const std::string& action_name,
for (size_t i = 0; i < mime_types->GetSize(); ++i) {
if (!mime_types->GetString(i, &service.type)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIntentTypeElement, action_name,
std::string(base::IntToString(i)));
return false;
@@ -2134,7 +2134,7 @@ bool Extension::LoadFileHandler(const std::string& handler_id,
if (!handler_info.HasKey(keys::kFileHandlerTypes) ||
!handler_info.GetList(keys::kFileHandlerTypes, &mime_types) ||
mime_types->GetSize() == 0) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidFileHandlerType, handler_id);
return false;
}
@@ -2149,7 +2149,7 @@ bool Extension::LoadFileHandler(const std::string& handler_id,
for (size_t i = 0; i < mime_types->GetSize(); ++i) {
if (!mime_types->GetString(i, &service.type)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidFileHandlerTypeElement, handler_id,
std::string(base::IntToString(i)));
return false;
@@ -2252,7 +2252,7 @@ bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
// Get input_components[i].name.
if (!module_value->GetString(keys::kName, &name_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentName, base::IntToString(i));
return false;
}
@@ -2263,12 +2263,12 @@ bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
if (type_str == "ime") {
type = INPUT_COMPONENT_TYPE_IME;
} else {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentType, base::IntToString(i));
return false;
}
} else {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentType, base::IntToString(i));
return false;
}
@@ -2280,7 +2280,7 @@ bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
// Get input_components[i].description.
if (!module_value->GetString(keys::kDescription, &description_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentDescription, base::IntToString(i));
return false;
}
@@ -2299,7 +2299,7 @@ bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
for (size_t j = 0; j < layouts_value->GetSize(); ++j) {
std::string layout_name_str;
if (!layouts_value->GetString(j, &layout_name_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentLayoutName, base::IntToString(i),
base::IntToString(j));
return false;
@@ -2310,14 +2310,14 @@ bool Extension::LoadInputComponents(const APIPermissionSet& api_permissions,
if (module_value->HasKey(keys::kShortcutKey)) {
DictionaryValue* shortcut_value = NULL;
if (!module_value->GetDictionary(keys::kShortcutKey, &shortcut_value)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentShortcutKey, base::IntToString(i));
return false;
}
// Get input_components[i].shortcut_keycode.
if (!shortcut_value->GetString(keys::kKeycode, &shortcut_keycode_str)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidInputComponentShortcutKeycode,
base::IntToString(i));
return false;
@@ -2367,7 +2367,7 @@ bool Extension::LoadContentScripts(string16* error) {
for (size_t i = 0; i < list_value->GetSize(); ++i) {
DictionaryValue* content_script = NULL;
if (!list_value->GetDictionary(i, &content_script)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidContentScript, base::IntToString(i));
return false;
}
@@ -2572,7 +2572,7 @@ FileBrowserHandler* Extension::LoadFileBrowserHandler(
std::string access;
if (!access_list_value->GetString(i, &access) ||
result->AddFileAccessPermission(access)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidFileAccessValue, base::IntToString(i));
return NULL;
}
@@ -2596,7 +2596,7 @@ FileBrowserHandler* Extension::LoadFileBrowserHandler(
for (size_t i = 0; i < list_value->GetSize(); ++i) {
std::string filter;
if (!list_value->GetString(i, &filter)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidFileFilterValue, base::IntToString(i));
return NULL;
}
@@ -2604,7 +2604,7 @@ FileBrowserHandler* Extension::LoadFileBrowserHandler(
if (!StartsWithASCII(filter,
std::string(chrome::kFileSystemScheme) + ':',
true)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, filter);
return NULL;
}
@@ -2613,7 +2613,7 @@ FileBrowserHandler* Extension::LoadFileBrowserHandler(
filter.replace(0, 11, "chrome-extension://*/");
URLPattern pattern(URLPattern::SCHEME_EXTENSION);
if (pattern.Parse(filter) != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, filter);
return NULL;
}
@@ -2622,7 +2622,7 @@ FileBrowserHandler* Extension::LoadFileBrowserHandler(
(path.compare(0, 3, "/*.") == 0 &&
path.find_first_of('*', 3) == std::string::npos);
if (!allowed) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, filter);
return NULL;
}
@@ -2687,7 +2687,7 @@ bool Extension::LoadChromeURLOverrides(string16* error) {
std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
page.c_str());
if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidURLPatternError, url);
return false;
}
@@ -2880,7 +2880,7 @@ bool Extension::LoadAppIsolation(const APIPermissionSet& api_permissions,
for (size_t i = 0; i < isolation_list->GetSize(); ++i) {
std::string isolation_string;
if (!isolation_list->GetString(i, &isolation_string)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidIsolationValue,
base::UintToString(i));
return false;
@@ -3434,7 +3434,7 @@ bool Extension::ParsePermissions(const char* key,
if (manifest_->HasKey(key)) {
ListValue* permissions = NULL;
if (!manifest_->GetList(key, &permissions)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPermissions, "");
return false;
}
@@ -3505,7 +3505,7 @@ bool Extension::ParsePermissions(const char* key,
URLPattern::ParseResult parse_result = pattern.Parse(permission_str);
if (parse_result == URLPattern::PARSE_SUCCESS) {
if (!CanSpecifyHostPermission(pattern, *api_permissions)) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kInvalidPermissionScheme, permission_str);
return false;
}
@@ -3729,7 +3729,7 @@ bool Extension::CanExecuteScriptOnPage(const GURL& document_url,
}
if (error) {
- *error = ExtensionErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
+ *error = ErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
document_url.spec());
}
@@ -3794,7 +3794,7 @@ bool Extension::CanCaptureVisiblePage(const GURL& page_url,
return true;
if (error) {
- *error = ExtensionErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
+ *error = ErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
page_url.spec());
}
return false;
@@ -4007,7 +4007,7 @@ bool Extension::CheckMinimumChromeVersion(string16* error) const {
}
if (current_version.CompareTo(minimum_version) < 0) {
- *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ *error = ErrorUtils::FormatErrorMessageUTF16(
errors::kChromeVersionTooLow,
l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
minimum_version_string);
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | chrome/common/extensions/extension_error_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698