Implementing unified Chrome / App Launcher flow, and migrating old stand-alone App Launcher.

chrome/installer/setup/setup_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 466 matching lines @@
             IDS_INSTALL_MULTI_INSTALLATION_EXISTS_BASE, NULL);
         return false;
       }
     }
   }
 
   return true;
 }
 
 // Checks app host pre-install conditions, specifically that this is a
-// user-level multi-install.  When the pre-install conditions are not
-// satisfied, the result is written to the registry (via WriteInstallerResult),
-// |status| is set appropriately, and false is returned.
-bool CheckAppHostPreconditions(const InstallationState& original_state,
-                               InstallerState* installer_state,
-                               installer::InstallStatus* status) {
+// multi-install. When the pre-install conditions are not satisfied, the result
+// is written to the registry (via WriteInstallerResult), |status| is set
+// appropriately, and false is returned.
+bool CheckAppLauncherPreconditions(const InstallationState& original_state,
+                                   InstallerState* installer_state,
+                                   installer::InstallStatus* status) {
   if (installer_state->FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
-
     if (!installer_state->is_multi_install()) {

[gab, 2013/05/15 22:42:20]

&& instead of 2 ifs

[huangs, 2013/05/17 20:59:24]

Done.

       LOG(DFATAL) << "App Launcher requires multi install";
       *status = installer::APP_HOST_REQUIRES_MULTI_INSTALL;
       // No message string since there is nothing a user can do.
       installer_state->WriteInstallerResult(*status, 0, NULL);
       return false;
     }
-
-    if (installer_state->system_install()) {
-      LOG(DFATAL) << "App Launcher may only be installed at user-level.";
-      *status = installer::APP_HOST_REQUIRES_USER_LEVEL;
-      // No message string since there is nothing a user can do.
-      installer_state->WriteInstallerResult(*status, 0, NULL);
-      return false;
-    }
-
   }
 
   return true;
 }
 
 // Checks for compatibility between the current state of the system and the
 // desired operation.  Also applies policy that mutates the desired operation;
 // specifically, the |installer_state| object.
 // Also blocks simultaneous user-level and system-level installs.  In the case
 // of trying to install user-level Chrome when system-level exists, the
 // existing system-level Chrome is launched.
 // When the pre-install conditions are not satisfied, the result is written to
 // the registry (via WriteInstallerResult), |status| is set appropriately, and
 // false is returned.
 bool CheckPreInstallConditions(const InstallationState& original_state,
                                InstallerState* installer_state,
                                installer::InstallStatus* status) {
-  if (!CheckAppHostPreconditions(original_state, installer_state, status)) {
+  if (!CheckAppLauncherPreconditions(original_state, installer_state, status)) {
     DCHECK_NE(*status, installer::UNKNOWN_STATUS);
     return false;
   }
 
   // See what products are already installed in multi mode.  When we do multi
   // installs, we must upgrade all installations since they share the binaries.
   AddExistingMultiInstalls(original_state, installer_state);
 
   if (!CheckMultiInstallConditions(original_state, installer_state, status)) {
     DCHECK_NE(*status, installer::UNKNOWN_STATUS);
@@ skipping 27 matching lines @@
       const ProductState* user_level_product_state =
           original_state.GetProductState(false, browser_dist->GetType());
       const ProductState* system_level_product_state =
           original_state.GetProductState(true, browser_dist->GetType());
 
       // Allow upgrades to proceed so that out-of-date versions are not left
       // around.
       if (user_level_product_state)
         continue;
 
+      if (system_level_product_state &&
+          installer_state->need_to_migrate_legacy_app_launcher()) {
+        // This is called if we we have (old) user app_host.exe coexisting with
+        // (new) system-level Chrome, and then the app_host.exe is executed.
+        // app_host.exe detects system-level Chrome, and calls new setup.exe
+        // with --app-launcher (and arrive to this point). We now call the old
+        // setup.exe to uninstall the old stuff.
+        CommandLine uninstall_cmd(InstallUtil::GetChromeUninstallCmd(
+            false, BrowserDistribution::CHROME_APP_HOST));
+        if (!uninstall_cmd.GetProgram().empty()) {
+          uninstall_cmd.AppendSwitch(installer::switches::kSelfDestruct);
+          uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall);
+          uninstall_cmd.AppendSwitch(
+              installer::switches::kDoNotRemoveSharedItems);
+          base::LaunchProcess(uninstall_cmd, base::LaunchOptions(), NULL);
+        }
+        *status = installer::APP_HOST_SELF_DESTRUCT;
+        return false;
+      }
+
       // This is a new user-level install...
 
       if (system_level_product_state) {
         // ... and the product already exists at system-level.
         LOG(ERROR) << "Already installed version "
                    << system_level_product_state->version().GetString()
                    << " at system-level conflicts with this one at user-level.";
+

[gab, 2013/05/15 22:42:20]

nit: remove new empty lines :)

[huangs, 2013/05/17 20:59:24]

Done.

+
         if (product.is_chrome()) {
           // Instruct Google Update to launch the existing system-level Chrome.
           // There should be no error dialog.
           base::FilePath install_path(installer::GetChromeInstallPath(
               true,  // system
               browser_dist));
           if (install_path.empty()) {
             // Give up if we failed to construct the install path.
             *status = installer::OS_ERROR;
             installer_state->WriteInstallerResult(*status,
@@ skipping 1134 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }