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 139b8274e9eb5c81aba8e38593fc0d1b12a05436..7a0432ad11a98a7b84c39d1dab93fa0e6dc98aa6 100644 |
| --- a/chrome/installer/setup/setup_main.cc |
| +++ b/chrome/installer/setup/setup_main.cc |
| @@ -1090,12 +1090,26 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state, |
| } |
| } else if (cmd_line.HasSwitch( |
| installer::switches::kConfigureUserSettings)) { |
| + // NOTE: Should the work done here, on kConfigureUserSettings, change: |
| + // kActiveSetupVersion in install_worker.cc needs to be increased for Active |
| + // Setup to invoke this again for all users of this install. |
| DCHECK(installer_state->system_install()); |
|
grt (UTC plus 2)
2012/09/02 14:18:19
since it's legitimate for someone to inadvertently
gab
2012/09/02 16:15:12
Done and made InstallStatus better for this type o
grt (UTC plus 2)
2012/09/04 13:29:59
I don't think this new status code provides much o
gab
2012/09/04 15:40:36
As discussed, we would rather never see UNKNOWN_ST
|
| const Product* chrome_install = |
| installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); |
| - DCHECK(chrome_install); |
| - // TODO(gab): Implement the new shortcut functionality here. |
| - LOG(ERROR) << "--configure-user-settings is not implemented."; |
| + |
| + // Create per-user Start Menu shortcuts. |
| + // TODO(gab): This should really be more involved, but for now creating |
| + // the shortcut and leaving it non-updated in later updates is fine. |
| + // This is all coming in an upcoming refactoring of the shortcuts, but for |
| + // now this will simply create the user-level shortcut once on the first |
| + // (and only) invocation of Active Setup for Chrome for this user. |
| + if (chrome_install) |
| + ForceCreateUserLevelStartMenuShortcut(*installer_state, *chrome_install); |
| + else |
| + NOTREACHED(); |
| + |
| + *exit_code = InstallUtil::GetInstallReturnCode(installer::INSTALL_REPAIRED); |
| + |
| } else if (cmd_line.HasSwitch( |
| installer::switches::kRegisterChromeBrowser)) { |
| installer::InstallStatus status = installer::UNKNOWN_STATUS; |