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 /chrome/installer/setup/setup_util.cc | |
| 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 'chrome/installer/setup/setup_util.cc')
| -rw-r--r-- | chrome/installer/setup/setup_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 34eed36..d982792 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/string_util.h" #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/util_constants.h" #include "courgette/courgette.h" @@ -45,7 +46,7 @@ Version* installer::GetVersionFromArchiveDir(const FilePath& chrome_path) { file_util::FileEnumerator::FindInfo find_data = {0}; version_enum.GetFindInfo(&find_data); VLOG(1) << "directory found: " << find_data.cFileName; - version = Version::GetVersionFromString(find_data.cFileName); + version = Version::GetVersionFromString(WideToASCII(find_data.cFileName)); if (version) break; } |