chrome/installer/setup/setup_util.cc - Issue 5848005: base/version: remove wstring version

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/setup/setup_util.cc

Issue 5848005: base/version: remove wstring version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: retry 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:

Index: chrome/installer/setup/setup_util.cc

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc

index 34eed366201c019062d586e3e320e48f2fa1de6a..d9827929d7d9db83a8b9ffe12742980aab2233fe 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;

}

« no previous file with comments | « chrome/common/extensions/extension.cc ('k') | chrome/installer/util/helper_unittest.cc » ('j') | no next file with comments »