Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/plugins/plugin_group.cc

Issue 5905006: Revert 69490 - base/version: remove wstring version... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_group.cc
===================================================================
--- webkit/glue/plugins/plugin_group.cc (revision 69490)
+++ webkit/glue/plugins/plugin_group.cc (working copy)
@@ -183,7 +183,7 @@
// There's at least one version range, the plugin's version must be in it.
scoped_ptr<Version> plugin_version(
- Version::GetVersionFromString(UTF16ToASCII(plugin.version)));
+ Version::GetVersionFromString(UTF16ToWide(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 @@
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) {
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698