diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:44:57 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:44:57 +0000 |
| commit | c9d8113703584a262972858475a560c78733a7dd (patch) | |
| tree | 89fdd28a63032b7c1277c2fcd39f111a2522db91 /webkit/glue/webkitclient_impl.cc | |
| parent | 40e93e58ffd857435bfd509772a621efea1e8746 (diff) | |
| download | chromium_src-c9d8113703584a262972858475a560c78733a7dd.zip chromium_src-c9d8113703584a262972858475a560c78733a7dd.tar.gz chromium_src-c9d8113703584a262972858475a560c78733a7dd.tar.bz2 | |
Convert WebPluginInfo from wstring to string16
BUG=None
TEST=No behavioral change; plugins should continue to work.
Review URL: http://codereview.chromium.org/2866014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkitclient_impl.cc')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index ff0d93b..9808339 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -194,16 +194,14 @@ void WebKitClientImpl::getPluginList(bool refresh, const WebPluginInfo& plugin = plugins[i]; builder->addPlugin( - WideToUTF16Hack(plugin.name), - WideToUTF16Hack(plugin.desc), + plugin.name, plugin.desc, FilePathStringToWebString(plugin.path.BaseName().value())); for (size_t j = 0; j < plugin.mime_types.size(); ++j) { const WebPluginMimeType& mime_type = plugin.mime_types[j]; builder->addMediaTypeToLastPlugin( - WebString::fromUTF8(mime_type.mime_type), - WideToUTF16Hack(mime_type.description)); + WebString::fromUTF8(mime_type.mime_type), mime_type.description); for (size_t k = 0; k < mime_type.file_extensions.size(); ++k) { builder->addFileExtensionToLastMediaType( |