diff options
Diffstat (limited to 'chromium/content/common/pepper_plugin_list.cc')
| -rw-r--r-- | chromium/content/common/pepper_plugin_list.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/content/common/pepper_plugin_list.cc b/chromium/content/common/pepper_plugin_list.cc index ec5f6ae0795..fac77f6f2e4 100644 --- a/chromium/content/common/pepper_plugin_list.cc +++ b/chromium/content/common/pepper_plugin_list.cc @@ -79,7 +79,7 @@ void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) { // This means we can't provide plugins from non-ASCII paths, but // since this switch is only for development I don't think that's // too awful. - plugin.path = base::FilePath(ASCIIToUTF16(name_parts[0])); + plugin.path = base::FilePath(base::ASCIIToUTF16(name_parts[0])); #else plugin.path = base::FilePath(name_parts[0]); #endif @@ -108,8 +108,10 @@ void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) { } // If the plugin name is empty, use the filename. - if (plugin.name.empty()) - plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName()); + if (plugin.name.empty()) { + plugin.name = + base::UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName()); + } // Command-line plugins get full permissions. plugin.permissions = ppapi::PERMISSION_ALL_BITS; @@ -132,9 +134,9 @@ bool MakePepperPluginInfo(const WebPluginInfo& webplugin_info, WebPluginInfo::PLUGIN_TYPE_PEPPER_UNSANDBOXED; pepper_info->path = base::FilePath(webplugin_info.path); - pepper_info->name = UTF16ToASCII(webplugin_info.name); - pepper_info->description = UTF16ToASCII(webplugin_info.desc); - pepper_info->version = UTF16ToASCII(webplugin_info.version); + pepper_info->name = base::UTF16ToASCII(webplugin_info.name); + pepper_info->description = base::UTF16ToASCII(webplugin_info.desc); + pepper_info->version = base::UTF16ToASCII(webplugin_info.version); pepper_info->mime_types = webplugin_info.mime_types; pepper_info->permissions = webplugin_info.pepper_permissions; |