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 /chrome/browser/dom_ui | |
| 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 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/plugins_ui.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index b24a902..d14df5c 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -220,9 +220,9 @@ DictionaryValue* PluginsDOMHandler::CreatePluginDetailValue( const WebPluginInfo& plugin) { DictionaryValue* plugin_data = new DictionaryValue(); plugin_data->SetString(L"path", plugin.path.value()); - plugin_data->SetString(L"name", plugin.name); - plugin_data->SetString(L"version", plugin.version); - plugin_data->SetString(L"description", plugin.desc); + plugin_data->SetStringFromUTF16(L"name", plugin.name); + plugin_data->SetStringFromUTF16(L"version", plugin.version); + plugin_data->SetStringFromUTF16(L"description", plugin.desc); plugin_data->SetBoolean(L"enabled", plugin.enabled); ListValue* mime_types = new ListValue(); @@ -232,7 +232,7 @@ DictionaryValue* PluginsDOMHandler::CreatePluginDetailValue( ++type_it) { DictionaryValue* mime_type = new DictionaryValue(); mime_type->SetString(L"mimeType", type_it->mime_type); - mime_type->SetString(L"description", type_it->description); + mime_type->SetStringFromUTF16(L"description", type_it->description); ListValue* file_extensions = new ListValue(); for (std::vector<std::string>::const_iterator ext_it = @@ -254,8 +254,8 @@ DictionaryValue* PluginsDOMHandler::CreatePluginSummaryValue( const WebPluginInfo& plugin) { DictionaryValue* plugin_data = new DictionaryValue(); plugin_data->SetString(L"path", plugin.path.value()); - plugin_data->SetString(L"name", plugin.name); - plugin_data->SetString(L"version", plugin.version); + plugin_data->SetStringFromUTF16(L"name", plugin.name); + plugin_data->SetStringFromUTF16(L"version", plugin.version); plugin_data->SetBoolean(L"enabled", plugin.enabled); return plugin_data; } |