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

Unified Diff: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

Issue 1358513003: Use correct IntToString variants in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
Index: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
index 6098eace3a6dfa2919413053a7021a05981b0035..d2d713125d3e73168d2907ca7c4b572dbfdef46c 100644
--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
@@ -57,10 +57,8 @@ bool LoadGlobsHelper(const base::DictionaryValue* content_script,
std::string glob;
if (!list->GetString(i, &glob)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidGlob,
- base::IntToString(content_script_index),
- globs_property_name,
- base::IntToString(i));
+ errors::kInvalidGlob, base::IntToString(content_script_index),
+ globs_property_name, base::SizeTToString(i));
return false;
}
@@ -143,10 +141,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
std::string match_str;
if (!matches->GetString(j, &match_str)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidMatch,
- base::IntToString(definition_index),
- base::IntToString(j),
- errors::kExpectString);
+ errors::kInvalidMatch, base::IntToString(definition_index),
+ base::SizeTToString(j), errors::kExpectString);
return false;
}
@@ -156,9 +152,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
URLPattern::ParseResult parse_result = pattern.Parse(match_str);
if (parse_result != URLPattern::PARSE_SUCCESS) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidMatch,
- base::IntToString(definition_index),
- base::IntToString(j),
+ errors::kInvalidMatch, base::IntToString(definition_index),
+ base::SizeTToString(j),
URLPattern::GetParseResultString(parse_result));
return false;
}
@@ -200,10 +195,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
std::string match_str;
if (!exclude_matches->GetString(j, &match_str)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidExcludeMatch,
- base::IntToString(definition_index),
- base::IntToString(j),
- errors::kExpectString);
+ errors::kInvalidExcludeMatch, base::IntToString(definition_index),
+ base::SizeTToString(j), errors::kExpectString);
return false;
}
@@ -214,8 +207,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
URLPattern::ParseResult parse_result = pattern.Parse(match_str);
if (parse_result != URLPattern::PARSE_SUCCESS) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidExcludeMatch,
- base::IntToString(definition_index), base::IntToString(j),
+ errors::kInvalidExcludeMatch, base::IntToString(definition_index),
+ base::SizeTToString(j),
URLPattern::GetParseResultString(parse_result));
return false;
}
@@ -269,9 +262,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
std::string relative;
if (!js->Get(script_index, &value) || !value->GetAsString(&relative)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidJs,
- base::IntToString(definition_index),
- base::IntToString(script_index));
+ errors::kInvalidJs, base::IntToString(definition_index),
+ base::SizeTToString(script_index));
return false;
}
GURL url = extension->GetResourceURL(relative);
@@ -288,9 +280,8 @@ bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
std::string relative;
if (!css->Get(script_index, &value) || !value->GetAsString(&relative)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidCss,
- base::IntToString(definition_index),
- base::IntToString(script_index));
+ errors::kInvalidCss, base::IntToString(definition_index),
+ base::SizeTToString(script_index));
return false;
}
GURL url = extension->GetResourceURL(relative);
@@ -406,8 +397,7 @@ bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {
const base::DictionaryValue* script_dict = NULL;
if (!scripts_list->GetDictionary(i, &script_dict)) {
*error = ErrorUtils::FormatErrorMessageUTF16(
- errors::kInvalidContentScript,
- base::IntToString(i));
+ errors::kInvalidContentScript, base::SizeTToString(i));
return false;
}
« no previous file with comments | « chrome/common/extensions/api/plugins/plugins_handler.cc ('k') | chrome/common/net/x509_certificate_model_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698