Implement installation of the Chrome App Host.

chrome/installer/setup/install_worker.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.
 //
 // This file contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <oaidl.h>
@@ skipping 122 matching lines @@
   // locate the setup.exe instance used for binary patching.
   // Do not quote the command line for the MSI invocation.
   FilePath install_path(installer_state.target_path());
   FilePath installer_path(installer_state.GetInstallerDirectory(new_version));
   installer_path = installer_path.Append(setup_path.BaseName());
 
   CommandLine uninstall_arguments(CommandLine::NO_PROGRAM);
   AppendUninstallCommandLineFlags(installer_state, product,
                                   &uninstall_arguments);
 
+  // TODO(erikwright): What does this mean? Chrome Frame _is_ in Add/Remove, No?

[tommi (sloooow) - chröme, 2012/07/12 08:11:31]

I think the comment is out of date and was probably written early on during the
multi-install phase.

[grt (UTC plus 2), 2012/07/12 18:37:10]

I think it refers to ready-mode, where Chrome Frame is installed yet not present
in Add/Remove.

[erikwright (departed), 2012/07/16 20:13:11]

Done.

   // The Chrome uninstallation command serves as the master uninstall command
   // for Chrome + all other products (i.e. Chrome Frame) that do not have an
   // uninstall entry in the Add/Remove Programs dialog.  We skip this processing
   // in case of uninstall since this means that Chrome Frame is being
   // uninstalled, so there's no need to do any looping.
   if (product.is_chrome() &&
       installer_state.operation() != InstallerState::UNINSTALL) {
     const Products& products = installer_state.products();
     for (size_t i = 0; i < products.size(); ++i) {
       const Product& p = *products[i];
@@ skipping 403 matching lines @@
 // do a few post install tasks:
 // - Handle the case of in-use-update by updating "opv" (old version) key or
 //   deleting it if not required.
 // - Register any new dlls and unregister old dlls.
 // - If this is an MSI install, ensures that the MSI marker is set, and sets
 //   it if not.
 // If these operations are successful, the function returns true, otherwise
 // false.
 bool AppendPostInstallTasks(const InstallerState& installer_state,
                             const FilePath& setup_path,
-                            const FilePath& new_chrome_exe,
                             const Version* current_version,
                             const Version& new_version,
                             const FilePath& temp_path,
                             WorkItemList* post_install_task_list) {
   DCHECK(post_install_task_list);
 
   HKEY root = installer_state.root_key();
   const Products& products = installer_state.products();
+  FilePath new_chrome_exe(
+      installer_state.target_path().Append(installer::kChromeNewExe));
 
   // Append work items that will only be executed if this was an update.
   // We update the 'opv' value with the current version that is active,
   // the 'cpv' value with the critical update version (if present), and the
   // 'cmd' value with the rename command to run.
   {
     scoped_ptr<WorkItemList> in_use_update_work_items(
         WorkItem::CreateConditionalWorkItemList(
             new ConditionRunIfFileExists(new_chrome_exe)));
     in_use_update_work_items->set_log_message("InUseUpdateWorkItemList");
@@ skipping 120 matching lines @@
     if (installer_state.is_multi_install()) {
       AddSetMsiMarkerWorkItem(installer_state,
           installer_state.multi_package_binaries_distribution(), true,
           post_install_task_list);
     }
   }
 
   return true;
 }
 
-void AddInstallWorkItems(const InstallationState& original_state,
-                         const InstallerState& installer_state,
-                         const FilePath& setup_path,
-                         const FilePath& archive_path,
-                         const FilePath& src_path,
-                         const FilePath& temp_path,
-                         const Version& new_version,
-                         scoped_ptr<Version>* current_version,
-                         WorkItemList* install_list) {
-  DCHECK(install_list);
-
+void AddChromeWorkItems(const InstallationState& original_state,
+                        const InstallerState& installer_state,
+                        const FilePath& setup_path,
+                        const FilePath& archive_path,
+                        const FilePath& src_path,
+                        const FilePath& temp_path,
+                        const Version& new_version,
+                        scoped_ptr<Version>* current_version,
+                        WorkItemList* install_list) {
   const FilePath& target_path = installer_state.target_path();
 
-  // A temp directory that work items need and the actual install directory.
-  install_list->AddCreateDirWorkItem(temp_path);
-  install_list->AddCreateDirWorkItem(target_path);
-
   if (current_version != NULL && current_version->get() != NULL) {
     // Delete the archive from an existing install to save some disk space.  We
     // make this an unconditional work item since there's no need to roll this
     // back; if installation fails we'll be moved to the "-full" channel anyway.
     FilePath old_installer_dir(
         installer_state.GetInstallerDirectory(**current_version));
     FilePath old_archive(old_installer_dir.Append(archive_path.BaseName()));
     install_list->AddDeleteTreeWorkItem(old_archive, temp_path)
         ->set_ignore_failure(true);
   }
@@ skipping 91 matching lines @@
   // Delete any old_chrome.exe if present (ignore failure if it's in use).
   install_list->AddDeleteTreeWorkItem(
       target_path.Append(installer::kChromeOldExe), temp_path)
       ->set_ignore_failure(true);
 
   // Copy installer in install directory and
   // add shortcut in Control Panel->Add/Remove Programs.
   AddInstallerCopyTasks(installer_state, setup_path, archive_path, temp_path,
                         new_version, install_list);
 
+}
+
+void AddInstallWorkItems(const InstallationState& original_state,
+                         const InstallerState& installer_state,
+                         const FilePath& setup_path,
+                         const FilePath& archive_path,
+                         const FilePath& src_path,
+                         const FilePath& temp_path,
+                         const Version& new_version,
+                         scoped_ptr<Version>* current_version,
+                         WorkItemList* install_list) {
+  DCHECK(install_list);
+
+  const FilePath& target_path = installer_state.target_path();
+
+  // A temp directory that work items need and the actual install directory.
+  install_list->AddCreateDirWorkItem(temp_path);
+  install_list->AddCreateDirWorkItem(target_path);
+
+  if (installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) ||
+      installer_state.FindProduct(BrowserDistribution::CHROME_FRAME) ||
+      installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES)) {
+    AddChromeWorkItems(original_state,
+                       installer_state,
+                       setup_path,
+                       archive_path,
+                       src_path,
+                       temp_path,
+                       new_version,
+                       current_version,
+                       install_list);
+  }
+
+  if (installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
+    install_list->AddCopyTreeWorkItem(
+        src_path.Append(installer::kChromeAppHostExe).value(),
+        target_path.Append(installer::kChromeAppHostExe).value(),
+        temp_path.value(),
+        WorkItem::ALWAYS,
+        L"");
+  }
+
   const HKEY root = installer_state.root_key();
   // Only set "lang" for user-level installs since for system-level, the install
   // language may not be related to a given user's runtime language.
   const bool add_language_identifier = !installer_state.system_install();
 
   const Products& products = installer_state.products();
   for (size_t i = 0; i < products.size(); ++i) {
     const Product* product = products[i];
 
     AddUninstallShortcutWorkItems(installer_state, setup_path, new_version,
@@ skipping 22 matching lines @@
 
   // Copy over brand, usagestats, and other values.
   AddGoogleUpdateWorkItems(original_state, installer_state, install_list);
 
   AddQuickEnableWorkItems(installer_state, original_state, &setup_path,
                           &new_version, install_list);
 
   // Append the tasks that run after the installation.
   AppendPostInstallTasks(installer_state,
                          setup_path,
-                         new_chrome_exe,
                          current_version->get(),
                          new_version,
                          temp_path,
                          install_list);
 }
 
 void AddRegisterComDllWorkItems(const FilePath& dll_folder,
                                 const std::vector<FilePath>& dll_list,
                                 bool system_level,
                                 bool do_register,
@@ skipping 405 matching lines @@
                              const FilePath* setup_path,
                              const Version* new_version,
                              WorkItemList* work_item_list) {
   DCHECK(setup_path ||
          installer_state.operation() == InstallerState::UNINSTALL);
   DCHECK(new_version ||
          installer_state.operation() == InstallerState::UNINSTALL);
   DCHECK(work_item_list);
 
   const bool system_install = installer_state.system_install();
-  bool have_multi_chrome = false;
+  bool have_chrome_binaries = false;
   bool have_chrome_frame = false;
 
   // STEP 1: Figure out the state of the machine before the operation.
   const ProductState* product_state = NULL;
 
-  // Is multi-install Chrome already on the machine?
+  // Is Chrome Binaries already on the machine?

[tommi (sloooow) - chröme, 2012/07/12 08:11:31]

s/Is/Are the

[erikwright (departed), 2012/07/16 20:13:11]

Done.

   product_state =
       machine_state.GetProductState(system_install,
-                                    BrowserDistribution::CHROME_BROWSER);
+                                    BrowserDistribution::CHROME_BINARIES);
   if (product_state != NULL && product_state->is_multi_install())
-    have_multi_chrome = true;
+    have_chrome_binaries = true;
 
   // Is Chrome Frame !ready-mode already on the machine?
   product_state =
       machine_state.GetProductState(system_install,
                                     BrowserDistribution::CHROME_FRAME);
   if (product_state != NULL &&
       !product_state->uninstall_command().HasSwitch(
           switches::kChromeFrameReadyMode))
     have_chrome_frame = true;
 
   // STEP 2: Now take into account the current operation.
   const Product* product = NULL;
 
   if (installer_state.operation() == InstallerState::UNINSTALL) {
     // Forget about multi-install Chrome if it is being uninstalled.
     product =
-        installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER);
+        installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES);
     if (product != NULL && installer_state.is_multi_install())
-      have_multi_chrome = false;
+      have_chrome_binaries = false;
 
     // Forget about Chrome Frame if it is being uninstalled.  Note that we don't
     // bother to check !HasOption(kOptionReadyMode) since have_chrome_frame
     // should have been false for that case in the first place.  It's odd if it
     // wasn't, but the right thing to do in that case is to proceed with the
     // thought that CF will not be installed in any sense when we reach the
     // finish line.
     if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME) != NULL)
       have_chrome_frame = false;
   } else {
-    // Check if we're installing multi-install Chrome.
+    // Check if we're installing Chrome Binaries
     product =
-        installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER);
+        installer_state.FindProduct(BrowserDistribution::CHROME_BINARIES);
     if (product != NULL && installer_state.is_multi_install())
-      have_multi_chrome = true;
+      have_chrome_binaries = true;
 
     // Check if we're installing Chrome Frame !ready-mode.
     product = installer_state.FindProduct(BrowserDistribution::CHROME_FRAME);
     if (product != NULL && !product->HasOption(kOptionReadyMode))
       have_chrome_frame = true;
   }
 
   // STEP 3: Decide what to do based on the final state of things.
   enum QuickEnableOperation {
     DO_NOTHING,
     ADD_COMMAND,
     REMOVE_COMMAND
   } operation = DO_NOTHING;
   FilePath binaries_setup_path;
 
   if (have_chrome_frame) {
     // Chrome Frame !ready-mode is or will be installed.  Unconditionally remove
     // the quick-enable-cf command from the binaries.  We do this even if
     // multi-install Chrome isn't installed since we don't want them left
     // behind in any case.
     operation = REMOVE_COMMAND;
-  } else if (have_multi_chrome) {
+  } else if (have_chrome_binaries) {
     // Chrome Frame isn't (to be) installed or is (to be) installed only in
     // ready-mode, while multi-install Chrome is (to be) installed.  Add the
     // quick-enable-cf command to the binaries.
     operation = ADD_COMMAND;
     // The path to setup.exe contains the version of the Chrome binaries, so it
     // takes a little work to get it right.
     if (installer_state.operation() == InstallerState::UNINSTALL) {
-      // Chrome Frame is being uninstalled.  Use the path to the currently
-      // installed Chrome setup.exe.
+      // One or more products are being uninstalled, but not the binaries. Use
+      // the path to the currently installed Chrome setup.exe.
       product_state =
           machine_state.GetProductState(system_install,
-                                        BrowserDistribution::CHROME_BROWSER);
+                                        BrowserDistribution::CHROME_BINARIES);
       DCHECK(product_state);
       binaries_setup_path = product_state->uninstall_command().GetProgram();
     } else {
-      // Chrome is being installed, updated, or otherwise being operated on.
+      // Chrome Binaries are being installed, updated, or otherwise operated on.
       // Use the path to the given |setup_path| in the normal location of
-      // multi-install Chrome of the given |version|.
+      // multi-install Chrome Binaries of the given |version|.
       DCHECK(installer_state.is_multi_install());
       binaries_setup_path =
           installer_state.GetInstallerDirectory(*new_version).Append(
               setup_path->BaseName());
     }
   }
 
   // STEP 4: Take action.
   if (operation != DO_NOTHING) {
     // Get the path to the quick-enable-cf command for the binaries.
@@ skipping 18 matching lines @@
     } else {
       DCHECK(operation == REMOVE_COMMAND);
       work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(),
                                               cmd_key)->set_log_message(
           "removing quick-enable-cf command");
     }
   }
 }
 
 }  // namespace installer