diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 21:27:12 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 21:27:12 +0000 |
| commit | 36ee0327a9acf37dd445918029015994d88fb6f0 (patch) | |
| tree | 9435eaab619b17324177bfd6f9e4021809b3cad1 /webkit | |
| parent | 8d4c4bb33c199a0295d63a3ebfb7443c69d1f78c (diff) | |
| download | chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.zip chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.tar.gz chromium_src-36ee0327a9acf37dd445918029015994d88fb6f0.tar.bz2 | |
base/version: remove wstring version
And fix callers.
BUG=23581
TEST=trybots
Review URL: http://codereview.chromium.org/5848005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_group.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc index 0460198..23b0abc0 100644 --- a/webkit/plugins/npapi/plugin_group.cc +++ b/webkit/plugins/npapi/plugin_group.cc @@ -182,7 +182,7 @@ bool PluginGroup::Match(const WebPluginInfo& plugin) const { // There's at least one version range, the plugin's version must be in it. scoped_ptr<Version> plugin_version( - Version::GetVersionFromString(UTF16ToWide(plugin.version))); + Version::GetVersionFromString(UTF16ToASCII(plugin.version))); if (plugin_version.get() == NULL) { // No version could be extracted, assume we don't match the range. return false; @@ -208,7 +208,7 @@ Version* PluginGroup::CreateVersionFromString(const string16& version_string) { std::replace(version.begin(), version.end(), ',', '.'); std::replace(version.begin(), version.end(), '(', '.'); - return Version::GetVersionFromString(version); + return Version::GetVersionFromString(WideToASCII(version)); } void PluginGroup::UpdateActivePlugin(const WebPluginInfo& plugin) { |