diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:10:49 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:10:49 +0000 |
| commit | 18fa811d4bc5722293a7e53926ca4ee302253dd9 (patch) | |
| tree | 8577d17b4e65a21b84901ea857d41b3f108bb667 /chrome/installer | |
| parent | 1c1c77a5021be0b902240a4f78009a8d8f71d1ac (diff) | |
| download | chromium_src-18fa811d4bc5722293a7e53926ca4ee302253dd9.zip chromium_src-18fa811d4bc5722293a7e53926ca4ee302253dd9.tar.gz chromium_src-18fa811d4bc5722293a7e53926ca4ee302253dd9.tar.bz2 | |
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
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 18 | ||||
| -rwxr-xr-x | chrome/installer/util/prebuild/create_string_rc.py | 1 |
2 files changed, 15 insertions, 4 deletions
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', |