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

Unified Diff: extensions/common/manifest_handlers/shared_module_info.cc

Issue 112963005: Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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: extensions/common/manifest_handlers/shared_module_info.cc
diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc
index 0586719278e0978d43eb257d240df5fd17f33ee8..0c01f75a0697cfe6921060617296028e002a2e2d 100644
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -113,19 +113,19 @@ bool SharedModuleInfo::Parse(const Extension* extension,
return true;
if (has_import && has_export) {
- *error = ASCIIToUTF16(errors::kInvalidImportAndExport);
+ *error = base::ASCIIToUTF16(errors::kInvalidImportAndExport);
return false;
}
if (has_export) {
const base::DictionaryValue* export_value = NULL;
if (!extension->manifest()->GetDictionary(keys::kExport, &export_value)) {
- *error = ASCIIToUTF16(errors::kInvalidExport);
+ *error = base::ASCIIToUTF16(errors::kInvalidExport);
return false;
}
const base::ListValue* resources_list = NULL;
if (!export_value->GetList(keys::kResources, &resources_list)) {
- *error = ASCIIToUTF16(errors::kInvalidExportResources);
+ *error = base::ASCIIToUTF16(errors::kInvalidExportResources);
return false;
}
for (size_t i = 0; i < resources_list->GetSize(); ++i) {
@@ -149,13 +149,13 @@ bool SharedModuleInfo::Parse(const Extension* extension,
if (has_import) {
const base::ListValue* import_list = NULL;
if (!extension->manifest()->GetList(keys::kImport, &import_list)) {
- *error = ASCIIToUTF16(errors::kInvalidImport);
+ *error = base::ASCIIToUTF16(errors::kInvalidImport);
return false;
}
for (size_t i = 0; i < import_list->GetSize(); ++i) {
const base::DictionaryValue* import_entry = NULL;
if (!import_list->GetDictionary(i, &import_entry)) {
- *error = ASCIIToUTF16(errors::kInvalidImport);
+ *error = base::ASCIIToUTF16(errors::kInvalidImport);
return false;
}
std::string extension_id;
« no previous file with comments | « extensions/common/manifest_handlers/sandboxed_page_info.cc ('k') | extensions/common/permissions/permissions_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698