| Index: chrome/installer/setup/setup_main.cc
|
| ===================================================================
|
| --- chrome/installer/setup/setup_main.cc (revision 30707)
|
| +++ chrome/installer/setup/setup_main.cc (working copy)
|
| @@ -596,15 +596,25 @@
|
| prefs.get());
|
| }
|
|
|
| + BrowserDistribution* dist = BrowserDistribution::GetDistribution();
|
| +
|
| +#if defined(CHROME_FRAME_BUILD)
|
| if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
|
| - install_status = installer_util::UNINSTALL_SUCCESSFUL;
|
| -#if defined(CHROME_FRAME_BUILD)
|
| ShowRebootDialog();
|
| + } else if (parsed_command_line.HasSwitch(
|
| + installer_util::switches::kUninstall)) {
|
| + ::MessageBoxW(NULL,
|
| + installer_util::GetLocalizedString(
|
| + IDS_UNINSTALL_COMPLETE_BASE).c_str(),
|
| + dist->GetApplicationName().c_str(),
|
| + MB_OK);
|
| + }
|
| #endif
|
| +
|
| + if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
|
| + install_status = installer_util::UNINSTALL_SUCCESSFUL;
|
| }
|
|
|
| CoUninitialize();
|
| -
|
| - BrowserDistribution* dist = BrowserDistribution::GetDistribution();
|
| return dist->GetInstallReturnCode(install_status);
|
| }
|
|
|