chrome/installer/util/shell_util.cc - Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o...

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/util/shell_util.cc

Issue 280004: Revert wstring patch (r29078 and follow up commits). It is causing failures o... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 2 months 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

Index: chrome/installer/util/shell_util.cc

===================================================================

--- chrome/installer/util/shell_util.cc (revision 29084)

+++ chrome/installer/util/shell_util.cc (working copy)

@@ -295,7 +295,7 @@

const std::wstring& suffix) {

std::wstring exe_path(file_util::GetDirectoryFromPath(chrome_exe));

file_util::AppendToPath(&exe_path, installer_util::kSetupExe);

- if (!file_util::PathExists(FilePath::FromWStringHack(exe_path))) {

+ if (!file_util::PathExists(exe_path)) {

BrowserDistribution* dist = BrowserDistribution::GetDistribution();

HKEY reg_root = InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ?

HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;

@@ -305,7 +305,7 @@

command_line.ParseFromString(exe_path);

exe_path = command_line.program();

}

- if (file_util::PathExists(FilePath::FromWStringHack(exe_path))) {

+ if (file_util::PathExists(exe_path)) {

std::wstring params(L"--");

params.append(installer_util::switches::kRegisterChromeBrowser);

params.append(L"=\"" + chrome_exe + L"\"");

« no previous file with comments | « chrome/installer/util/move_tree_work_item.cc ('k') | chrome/test/mini_installer_test/chrome_mini_installer.cc » ('j') | no next file with comments »