Chromium Code Reviews| Index: chrome/installer/setup/setup_main.cc |
| diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc |
| index fef8e4cd4ddf4f8aa21a4d365dcb19cd068ec420..6ee46d4725a9ff1e05c7779e8472e0a759d73480 100644 |
| --- a/chrome/installer/setup/setup_main.cc |
| +++ b/chrome/installer/setup/setup_main.cc |
| @@ -28,6 +28,7 @@ |
| #include "base/win/win_util.h" |
| #include "base/win/windows_version.h" |
| #include "breakpad/src/client/windows/handler/exception_handler.h" |
| +#include "chrome/common/chrome_constants.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/installer/setup/chrome_frame_quick_enable.h" |
| #include "chrome/installer/setup/chrome_frame_ready_mode.h" |
| @@ -1004,12 +1005,41 @@ installer::InstallStatus UninstallProducts( |
| const CommandLine& cmd_line) { |
| const Products& products = installer_state.products(); |
| + // Decide whether Active Setup should be triggered and/or system-level Chrome |
| + // should be launched post-uninstall. This needs to be done outside the |
| + // UninstallProduct calls as some of them might terminate the processes |
| + // launched by a previous one otherwise... |
| + bool trigger_active_setup = false; |
| + // System-level Chrome will be launched via this command if its program gets |
| + // set below. |
| + CommandLine system_level_cmd(CommandLine::NO_PROGRAM); |
| + |
| if (installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER)) { |
| // InstallerState::Initialize always puts Chrome first, and we rely on that |
| // here for this reason: if Chrome is in-use, the user will be prompted to |
| // confirm uninstallation. Upon cancel, we should not continue with the |
| // other products. |
| DCHECK(products[0]->is_chrome()); |
| + |
| + if (cmd_line.HasSwitch(installer::switches::kSelfDestruct) && |
| + !installer_state.system_install()) { |
| + BrowserDistribution* dist = products[0]->distribution(); |
|
grt (UTC plus 2)
2013/01/03 15:41:27
even though there's a DCHECK to enforce that produ
gab
2013/01/03 17:11:14
Done.
|
| + const FilePath system_exe_path( |
| + installer::GetChromeInstallPath(true, dist) |
| + .Append(installer::kChromeExe)); |
| + system_level_cmd.SetProgram(system_exe_path); |
| + |
| + FilePath first_run_sentinel; |
| + InstallUtil::GetSentinelFilePath( |
| + chrome::kFirstRunSentinel, dist, &first_run_sentinel); |
| + if (file_util::PathExists(first_run_sentinel)) { |
| + // If the Chrome being self-destructed has already undergone First Run, |
| + // trigger Active Setup and make sure the system-level Chrome doesn't go |
| + // through first run. |
| + trigger_active_setup = true; |
| + system_level_cmd.AppendSwitch(::switches::kNoFirstRun); |
| + } |
| + } |
| } |
| if (installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) { |
| // Chrome Binaries should be last; if something else is cancelled, they |
| @@ -1035,6 +1065,12 @@ installer::InstallStatus UninstallProducts( |
| installer::CleanUpInstallationDirectoryAfterUninstall( |
| original_state, installer_state, cmd_line, &install_status); |
| + if (trigger_active_setup) |
| + InstallUtil::TriggerActiveSetupCommand(); |
| + |
| + if (!system_level_cmd.GetProgram().empty()) |
| + base::LaunchProcess(system_level_cmd, base::LaunchOptions(), NULL); |
| + |
| // Tell Google Update that an uninstall has taken place. |
| // Ignore the return value: success or failure of Google Update |
| // has no bearing on the success or failure of Chrome's uninstallation. |