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/automation | |
| 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/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 8c4b548..1630f14a 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -2105,10 +2105,10 @@ void AutomationProvider::GetPluginsInfo(Browser* browser, it != plugins.end(); ++it) { DictionaryValue* item = new DictionaryValue; - item->SetString(L"name", it->name); + item->SetStringFromUTF16(L"name", it->name); item->SetString(L"path", it->path.value()); - item->SetString(L"version", it->version); - item->SetString(L"desc", it->desc); + item->SetStringFromUTF16(L"version", it->version); + item->SetStringFromUTF16(L"desc", it->desc); item->SetBoolean(L"enabled", it->enabled); // Add info about mime types. ListValue* mime_types = new ListValue(); @@ -2118,7 +2118,7 @@ void AutomationProvider::GetPluginsInfo(Browser* browser, ++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 = |