diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:53:46 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:53:46 +0000 |
| commit | 4d0f36e5227612dacc8e3d8b5c8e3ff44d0a5869 (patch) | |
| tree | 9111811103f24e9c98623944cbf6936afc6e88ea /chrome/installer/setup/install.cc | |
| parent | f726b1a863b6558b1c5f0886420fe9a2d1ac570c (diff) | |
| download | chromium_src-4d0f36e5227612dacc8e3d8b5c8e3ff44d0a5869.zip chromium_src-4d0f36e5227612dacc8e3d8b5c8e3ff44d0a5869.tar.gz chromium_src-4d0f36e5227612dacc8e3d8b5c8e3ff44d0a5869.tar.bz2 | |
Reverting 27876.
Review URL: http://codereview.chromium.org/256043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.cc')
| -rw-r--r-- | chrome/installer/setup/install.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 1bc8164..24d2f80 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -15,7 +15,6 @@ #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/create_reg_key_work_item.h" -#include "chrome/installer/util/delete_after_reboot_helper.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" @@ -96,7 +95,7 @@ void AddUninstallShortcutWorkItems(HKEY reg_root, uninstall_cmd.append(L"\" --"); uninstall_cmd.append(installer_util::switches::kUninstall); -#if defined(CHROME_FRAME_BUILD) +#ifdef CHROME_FRAME_BUILD uninstall_cmd.append(L" --"); uninstall_cmd.append(installer_util::switches::kForceUninstall); uninstall_cmd.append(L" --"); @@ -247,7 +246,7 @@ bool CreateOrUpdateChromeShortcuts(const std::wstring& exe_path, std::wstring arguments(L" --"); arguments.append(installer_util::switches::kUninstall); -#if defined(CHROME_FRAME_BUILD) +#ifdef CHROME_FRAME_BUILD arguments.append(L" --"); arguments.append(installer_util::switches::kForceUninstall); arguments.append(L" --"); @@ -460,13 +459,6 @@ bool InstallNewVersion(const std::wstring& exe_path, if (reg_root != HKEY_LOCAL_MACHINE && reg_root != HKEY_CURRENT_USER) return false; -#if defined(CHROME_FRAME_BUILD) - // Make sure that we don't end up deleting installed files on next reboot. - if (!RemoveFromMovesPendingReboot(install_path.c_str())) { - LOG(ERROR) << "Error accessing pending moves value."; - } -#endif - scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList()); // A temp directory that work items need and the actual install directory. install_list->AddCreateDirWorkItem(FilePath::FromWStringHack(temp_dir)); |