diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 20:41:52 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 20:41:52 +0000 |
commit | a724cebd7a83c0cd0a5c71c6981e28bf5ab0cc44 (patch) | |
tree | 533a80c29be6bb7c4d7f36d723ddac22b02fa73e /webkit | |
parent | 89c38364f4f452279f049e4d605bcd46838f7452 (diff) | |
download | chromium_src-a724cebd7a83c0cd0a5c71c6981e28bf5ab0cc44.zip chromium_src-a724cebd7a83c0cd0a5c71c6981e28bf5ab0cc44.tar.gz chromium_src-a724cebd7a83c0cd0a5c71c6981e28bf5ab0cc44.tar.bz2 |
wstring: remove wstring version of RemoveChars
BUG=23581
Review URL: http://codereview.chromium.org/7037014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/plugins/npapi/plugin_group.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc index 537b204..3c8b73f 100644 --- a/webkit/plugins/npapi/plugin_group.cc +++ b/webkit/plugins/npapi/plugin_group.cc @@ -244,15 +244,15 @@ bool PluginGroup::Match(const WebPluginInfo& plugin) const { Version* PluginGroup::CreateVersionFromString(const string16& version_string) { // Remove spaces and ')' from the version string, // Replace any instances of 'r', ',' or '(' with a dot. - std::wstring version = UTF16ToWide(version_string); - RemoveChars(version, L") ", &version); + std::string version = UTF16ToASCII(version_string); + RemoveChars(version, ") ", &version); std::replace(version.begin(), version.end(), 'd', '.'); std::replace(version.begin(), version.end(), 'r', '.'); std::replace(version.begin(), version.end(), ',', '.'); std::replace(version.begin(), version.end(), '(', '.'); std::replace(version.begin(), version.end(), '_', '.'); - return Version::GetVersionFromString(WideToASCII(version)); + return Version::GetVersionFromString(version); } void PluginGroup::UpdateActivePlugin(const WebPluginInfo& plugin) { |