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

Unified Diff: content/common/plugin_list_posix.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (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
« no previous file with comments | « content/common/plugin_list_mac.mm ('k') | content/common/plugin_list_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/plugin_list_posix.cc
diff --git a/content/common/plugin_list_posix.cc b/content/common/plugin_list_posix.cc
index acd7830f738aedaed1e44ddc8a383d5b78ab620c..0bfa2a7488c1b8769529605f3b55ad370194df1b 100644
--- a/content/common/plugin_list_posix.cc
+++ b/content/common/plugin_list_posix.cc
@@ -321,23 +321,23 @@ bool PluginList::ReadWebPluginInfo(const base::FilePath& filename,
const char* name = NULL;
NP_GetValue(NULL, nsPluginVariable_NameString, &name);
if (name) {
- info->name = UTF8ToUTF16(name);
+ info->name = base::UTF8ToUTF16(name);
ExtractVersionString(name, info);
}
const char* description = NULL;
NP_GetValue(NULL, nsPluginVariable_DescriptionString, &description);
if (description) {
- info->desc = UTF8ToUTF16(description);
+ info->desc = base::UTF8ToUTF16(description);
if (info->version.empty())
ExtractVersionString(description, info);
}
LOG_IF(ERROR, PluginList::DebugPluginLoading())
<< "Got info for plugin " << filename.value()
- << " Name = \"" << UTF16ToUTF8(info->name)
- << "\", Description = \"" << UTF16ToUTF8(info->desc)
- << "\", Version = \"" << UTF16ToUTF8(info->version)
+ << " Name = \"" << base::UTF16ToUTF8(info->name)
+ << "\", Description = \"" << base::UTF16ToUTF8(info->desc)
+ << "\", Version = \"" << base::UTF16ToUTF8(info->version)
<< "\".";
} else {
LOG_IF(ERROR, PluginList::DebugPluginLoading())
@@ -383,9 +383,10 @@ void PluginList::ParseMIMEDescription(
// It's ok for end to run off the string here. If there's no
// trailing semicolon we consume the remainder of the string.
if (end != std::string::npos) {
- mime_type.description = UTF8ToUTF16(description.substr(ofs, end - ofs));
+ mime_type.description =
+ base::UTF8ToUTF16(description.substr(ofs, end - ofs));
} else {
- mime_type.description = UTF8ToUTF16(description.substr(ofs));
+ mime_type.description = base::UTF8ToUTF16(description.substr(ofs));
}
mime_types->push_back(mime_type);
if (end == std::string::npos)
@@ -423,7 +424,7 @@ void PluginList::ExtractVersionString(const std::string& desc,
}
}
if (!version.empty()) {
- info->version = UTF8ToUTF16(version);
+ info->version = base::UTF8ToUTF16(version);
}
}
« no previous file with comments | « content/common/plugin_list_mac.mm ('k') | content/common/plugin_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698