Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7081)

Unified Diff: chrome/installer/setup/setup_main.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
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/util/copy_tree_work_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
===================================================================
--- chrome/installer/setup/setup_main.cc (revision 29084)
+++ chrome/installer/setup/setup_main.cc (working copy)
@@ -67,7 +67,7 @@
// Check if this is differential update and if it is, patch it to the
// installer archive that should already be on the machine. We assume
// it is a differential installer if chrome.7z is not found.
- if (!file_util::PathExists(FilePath::FromWStringHack(uncompressed_archive))) {
+ if (!file_util::PathExists(uncompressed_archive)) {
incremental_install = true;
LOG(INFO) << "Differential patch found. Applying to existing archive.";
if (!installed_version) {
@@ -163,11 +163,10 @@
// either does not exist or can be deleted (i.e. is not locked by some other
// process).
if (!installed_version) {
- FilePath install_path = FilePath::FromWStringHack(
- installer::GetChromeInstallPath(system_install));
+ std::wstring install_path(installer::GetChromeInstallPath(system_install));
if (file_util::PathExists(install_path) &&
!file_util::Delete(install_path, true)) {
- LOG(ERROR) << "Installation directory " << install_path.value()
+ LOG(ERROR) << "Installation directory " << install_path
<< " exists and can not be deleted.";
status = installer_util::INSTALL_DIR_IN_USE;
int str_id = IDS_INSTALL_DIR_IN_USE_BASE;
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/util/copy_tree_work_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698