diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:09:50 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:09:50 +0000 |
| commit | bf94d1a4cee4be0648778022f27100f8a074e34a (patch) | |
| tree | bc9c5a831207e06e5cbd179eafc9ffa2ea791589 /webkit/glue/plugins | |
| parent | e31134ff5c4b5889af71cc58b294d1935fd48322 (diff) | |
| download | chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.zip chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.tar.gz chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.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@69490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
| -rw-r--r-- | webkit/glue/plugins/plugin_group.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_group.cc b/webkit/glue/plugins/plugin_group.cc index 548e624..af3ff27 100644 --- a/webkit/glue/plugins/plugin_group.cc +++ b/webkit/glue/plugins/plugin_group.cc @@ -183,7 +183,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; @@ -209,7 +209,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) { |