From 18fa811d4bc5722293a7e53926ca4ee302253dd9 Mon Sep 17 00:00:00 2001
From: "robertshield@chromium.org"
 <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 3 Nov 2009 01:10:49 +0000
Subject: Add a confirmation dialog confirming the completion of uninstallation
 for Chrome Frame.

BUG=http://crbug.com/23995
TEST=Uninstall Chrome Frame in such a way that a reboot is not required. Verify that a confirmation dialog appears.

Review URL: http://codereview.chromium.org/355002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30780 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/chromium_strings.grd                    |  3 +++
 chrome/app/google_chrome_strings.grd               |  3 +++
 chrome/installer/setup/setup_main.cc               | 18 ++++++++++++++----
 chrome/installer/util/prebuild/create_string_rc.py |  1 +
 4 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'chrome')

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 0337d28..cd54741 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -335,6 +335,9 @@ be available for now. -->
       <message name="IDS_UNINSTALL_FAILED" desc="Error during uninstall if we can not find the installation directory from registry.">
         Chromium is not installed or it failed to find installation directory. Please download Chromium again.
       </message>
+      <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
+        Uninstallation complete.
+      </message>
       <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chromium version is missing from registry but the installation directory exists and can not be deleted.">
         Chromium installation directory seems to be in use. Please reboot your computer and try again.
       </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index d7177b3..135956b 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -385,6 +385,9 @@ Chrome supports. -->
       <message name="IDS_UNINSTALL_FAILED" desc="Error during uninstall if we can not find the installation directory from registry.">
         Google Chrome is not installed or it failed to find installation directory. Please download Google Chrome again.
       </message>
+      <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
+        Uninstallation complete.
+      </message>
       <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Google Chrome version is missing from registry but the installation directory exists and can not be deleted.">
         Google Chrome installation directory seems to be in use. Please reboot your computer and try again.
       </message>
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 11f2c6d..ce42a0f 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -596,15 +596,25 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                                    prefs.get());
   }
 
-  if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
-    install_status = installer_util::UNINSTALL_SUCCESSFUL;
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+
 #if defined(CHROME_FRAME_BUILD)
+  if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
     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);
 }
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
index daf6690..b573b4f 100755
--- a/chrome/installer/util/prebuild/create_string_rc.py
+++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -54,6 +54,7 @@ kStringIds = [
   'IDS_INSTALL_INVALID_ARCHIVE',
   'IDS_INSTALL_INSUFFICIENT_RIGHTS',
   'IDS_UNINSTALL_FAILED',
+  'IDS_UNINSTALL_COMPLETE',
   'IDS_INSTALL_DIR_IN_USE',
   'IDS_OEM_MAIN_SHORTCUT_NAME',
   'IDS_SHORTCUT_TOOLTIP',
-- 
cgit v1.1