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

Unified Diff: content/common/plugin_list_mac.mm

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.cc ('k') | content/common/plugin_list_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/plugin_list_mac.mm
diff --git a/content/common/plugin_list_mac.mm b/content/common/plugin_list_mac.mm
index fc4813a48d9d93c8da31fac5716ba418f357be6e..8ac4a65e60549b9279c96d50be072912367ce2e3 100644
--- a/content/common/plugin_list_mac.mm
+++ b/content/common/plugin_list_mac.mm
@@ -56,8 +56,9 @@ bool IsBlacklistedPlugin(const WebPluginInfo& info) {
// Versions of Flip4Mac 2.3 before 2.3.6 often hang the renderer, so don't
// load them.
- if (StartsWith(info.name, ASCIIToUTF16("Flip4Mac Windows Media"), false) &&
- StartsWith(info.version, ASCIIToUTF16("2.3"), false)) {
+ if (StartsWith(info.name,
+ base::ASCIIToUTF16("Flip4Mac Windows Media"), false) &&
+ StartsWith(info.version, base::ASCIIToUTF16("2.3"), false)) {
std::vector<base::string16> components;
base::SplitString(info.version, '.', &components);
int bugfix_version = 0;
@@ -169,14 +170,14 @@ bool ReadPlistPluginInfo(const base::FilePath& filename, CFBundleRef bundle,
if (plugin_name)
info->name = base::SysNSStringToUTF16(plugin_name);
else
- info->name = UTF8ToUTF16(filename.BaseName().value());
+ info->name = base::UTF8ToUTF16(filename.BaseName().value());
info->path = filename;
if (plugin_vers)
info->version = base::SysNSStringToUTF16(plugin_vers);
if (plugin_desc)
info->desc = base::SysNSStringToUTF16(plugin_desc);
else
- info->desc = UTF8ToUTF16(filename.BaseName().value());
+ info->desc = base::UTF8ToUTF16(filename.BaseName().value());
return true;
}
« no previous file with comments | « content/common/plugin_list.cc ('k') | content/common/plugin_list_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698