diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:11:37 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 17:11:37 +0000 |
| commit | a0a03624a6a1c79c4f7b8f0ce899b58e01105553 (patch) | |
| tree | b0c34b4048ebfa3881b39c11524139a18c77d2c4 /chrome/installer/setup/install.cc | |
| parent | 4a42535ddb0b508e5ce2b546a57a651c305f9aff (diff) | |
| download | chromium_src-a0a03624a6a1c79c4f7b8f0ce899b58e01105553.zip chromium_src-a0a03624a6a1c79c4f7b8f0ce899b58e01105553.tar.gz chromium_src-a0a03624a6a1c79c4f7b8f0ce899b58e01105553.tar.bz2 | |
Fix to use FilePath::DirName instead of FileUtil::UpOneDirectoryOrEmpty.
BUG=None
TEST=run installer_util_unittests.exe
Review URL: http://codereview.chromium.org/173042
Patch from Thiago Farina <thiago.farina@gmail.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.cc')
| -rw-r--r-- | chrome/installer/setup/install.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index a628327..0465d29 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -59,7 +59,8 @@ void AddInstallerCopyTasks(const std::wstring& exe_path, bool system_level) { std::wstring installer_dir(installer::GetInstallerPathUnderChrome( install_path, new_version)); - install_list->AddCreateDirWorkItem(installer_dir); + install_list->AddCreateDirWorkItem( + FilePath::FromWStringHack(installer_dir)); std::wstring exe_dst(installer_dir); std::wstring archive_dst(installer_dir); @@ -324,11 +325,11 @@ bool installer::InstallNewVersion(const std::wstring& exe_path, scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); // A temp directory that work items need and the actual install directory. - install_list->AddCreateDirWorkItem(temp_dir); - install_list->AddCreateDirWorkItem(install_path); + install_list->AddCreateDirWorkItem(FilePath::FromWStringHack(temp_dir)); + install_list->AddCreateDirWorkItem(FilePath::FromWStringHack(install_path)); // If it is system level install copy the version folder (since we want to - // take the permissions of %ProgramFiles% folder) otherwise just move it. + // take the permissions of %ProgramFiles% folder) otherwise just move it. if (reg_root == HKEY_LOCAL_MACHINE) { install_list->AddCopyTreeWorkItem( AppendPath(src_path, new_version.GetString()), |