diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:28:03 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 00:28:03 +0000 |
| commit | 680d201ec4f79642cca4073145fdb86e809eb03c (patch) | |
| tree | 2d90a0f932cffb68277d65152eedd7c6e5f35d4f /chrome/browser/enumerate_modules_model_win.cc | |
| parent | bf94d1a4cee4be0648778022f27100f8a074e34a (diff) | |
| download | chromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.zip chromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.tar.gz chromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.tar.bz2 | |
Revert 69490 - base/version: remove wstring version
And fix callers.
BUG=23581
TEST=trybots
Review URL: http://codereview.chromium.org/5848005
TBR=evan@chromium.org
Review URL: http://codereview.chromium.org/5905006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/enumerate_modules_model_win.cc')
| -rw-r--r-- | chrome/browser/enumerate_modules_model_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 83dc535..9de5c76 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -266,7 +266,7 @@ ModuleEnumerator::ModuleStatus ModuleEnumerator::Match( // We have a name match against the blacklist (and possibly location match // also), so check version. scoped_ptr<Version> module_version( - Version::GetVersionFromString(UTF16ToASCII(module.version))); + Version::GetVersionFromString(module.version)); scoped_ptr<Version> version_min( Version::GetVersionFromString(blacklisted.version_from)); scoped_ptr<Version> version_max( |