Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10778)

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 355002: Add a confirmation dialog confirming the completion of uninstallation for Chr... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/installer/util/prebuild/create_string_rc.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/installer/util/prebuild/create_string_rc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698