From 6ec54c1e86aa5d29c7223a86acbfa850be39c806 Mon Sep 17 00:00:00 2001
From: "estade@chromium.org"
<estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 15 Oct 2009 03:41:02 +0000
Subject: Revert wstring patch (r29078 and follow up commits). It is causing
failures on the buildbots.
TBR=nsylvain
Review URL: http://codereview.chromium.org/280004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29085 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/installer/util/shell_util.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'chrome/installer/util/shell_util.cc')
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 8e00ba2..86e588b 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -295,7 +295,7 @@ bool ElevateAndRegisterChrome(const std::wstring& chrome_exe,
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 @@ bool ElevateAndRegisterChrome(const std::wstring& chrome_exe,
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"\"");
--
cgit v1.1