diff options
Diffstat (limited to 'chrome/installer/setup/setup_main.cc')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index cb4cf7d..4d0c845 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -1051,11 +1051,16 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state, // We started as system-level and have been re-launched as user level // to continue with the toast experiment. scoped_ptr<Version> installed_version( - InstallUtil::GetChromeVersion(browser_dist, - installer_state->system_install())); - browser_dist->LaunchUserExperiment(cmd_line.GetProgram(), - installer::REENTRY_SYS_UPDATE, - *installed_version, *product, true); + InstallUtil::GetChromeVersion(browser_dist, true)); + if (!installed_version.get()) { + LOG(ERROR) << "No installation of " + << browser_dist->GetAppShortCutName() + << " found for system-level toast."; + } else { + browser_dist->LaunchUserExperiment(cmd_line.GetProgram(), + installer::REENTRY_SYS_UPDATE, + *installed_version, *product, true); + } } } else if (cmd_line.HasSwitch( installer::switches::kChromeFrameReadyModeOptIn)) { |