Add a new pair of installer result strings for multi-installer safeguards.

BUG=61609
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70507 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 7 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 5be20ce..3e92d34 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -403,6 +403,12 @@ be available for now. -->
       <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>
+      <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Chromium or Chromium Frame is present, thereby preventing the installation of a multi-install Chromium or Chromium Frame.">
+        A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again.
+      </message>
+      <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Chromium or Chromium Frame is present, thereby preventing the installation of a single-install Chromium or Chromium Frame.">
+        A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again.
+      </message>
       <!-- Options Dialog -->
       <!--TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.-->
       <message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 6aee81c..f4368ba 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -449,6 +449,12 @@ Chrome supports. -->
       <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>
+      <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a multi-install Google Chrome or Google Chrome Frame.">
+        A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again.
+      </message>
+      <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a single-install Google Chrome or Google Chrome Frame.">
+        A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again.
+      </message>
       <!-- Options Dialog -->
       <!-- TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.-->
       <message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index cc47f7b..2b9a85a 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -881,17 +881,15 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   if (!PopulateInstallations(prefs, &installations)) {
     // Currently this can only fail if one of the installations is a multi and
     // a pre-existing single installation exists or vice versa.
-    installer::InstallStatus status;
-    if (prefs.is_multi_install()) {
-      // TODO(grt): create a new string for this condition.
-      status = installer::NON_MULTI_INSTALLATION_EXISTS;
-    } else {
-      // TODO(grt): create a new string for this condition.
+    installer::InstallStatus status = installer::NON_MULTI_INSTALLATION_EXISTS;
+    int string_id = IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS_BASE;
+    if (!prefs.is_multi_install()) {
       status = installer::MULTI_INSTALLATION_EXISTS;
+      string_id = IDS_INSTALL_MULTI_INSTALLATION_EXISTS_BASE;
     }
     LOG(ERROR) << "Failed to populate installations: " << status;
     InstallUtil::WriteInstallerResult(system_install,
-        installer_state.state_key(), status, NULL, NULL);
+        installer_state.state_key(), status, string_id, NULL);
     return status;
   }
 
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
index 4bb669a..e9a7748 100755
--- a/chrome/installer/util/prebuild/create_string_rc.py
+++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -65,6 +65,8 @@ kStringIds = [
   'IDS_UNINSTALL_FAILED',
   'IDS_UNINSTALL_COMPLETE',
   'IDS_INSTALL_DIR_IN_USE',
+  'IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS',
+  'IDS_INSTALL_MULTI_INSTALLATION_EXISTS',
   'IDS_OEM_MAIN_SHORTCUT_NAME',
   'IDS_SHORTCUT_TOOLTIP',
 ]