Copy setup when quick-enabling app host to user-level from system-level.

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 144 matching lines @@
                            const FilePath& setup_path,
                            const FilePath& archive_path,
                            const FilePath& temp_path,
                            const Version& new_version,
                            WorkItemList* install_list) {
   DCHECK(install_list);
   FilePath installer_dir(installer_state.GetInstallerDirectory(new_version));
   install_list->AddCreateDirWorkItem(installer_dir);
 
   FilePath exe_dst(installer_dir.Append(setup_path.BaseName()));
   FilePath archive_dst(installer_dir.Append(archive_path.BaseName()));

[grt (UTC plus 2), 2012/11/16 13:32:42]

move this down to line 176

[erikwright (departed), 2012/11/20 20:14:30]

Done.

 
   if (exe_dst != setup_path) {
     install_list->AddCopyTreeWorkItem(setup_path.value(), exe_dst.value(),
                                       temp_path.value(), WorkItem::ALWAYS);
   }
 
-  if (archive_path != archive_dst) {
-    // In the past, we copied rather than moved for system level installs so
-    // that the permissions of %ProgramFiles% would be picked up.  Now that
-    // |temp_path| is in %ProgramFiles% for system level installs (and in
-    // %LOCALAPPDATA% otherwise), there is no need to do this for the archive.
-    // Setup.exe, on the other hand, is created elsewhere so it must always be
-    // copied.
+  // We don't copy the archive when only App Host is at user-level. Only

[grt (UTC plus 2), 2012/11/16 04:38:26]

how are the App Host binary and this setup.exe kept up to date?

[erikwright (departed), 2012/11/20 20:14:30]

replied elsewhere.

+  // setup.exe is required, and only for uninstall.
+  if (installer_state.products().size() != 1 ||

[grt (UTC plus 2), 2012/11/16 13:32:42]

the comment says to only skip this when doing the app host at user level, yet
the code doesn't reflect this.  which is correct?

[erikwright (departed), 2012/11/16 13:58:33]

The code reflects skipping this if exactly one product is being installed and
that product is APP_HOST. This scenario can only occur with a user-level
installation of the App Host piggybacking on a system-level Chrome Binaries.

How about:

// If only the App Host (not even the Chrome Binaries) is being installed, this
must be a user-level App Host piggybacking on system-level Chrome Binaries. Only
setup.exe is required, and only for uninstall.

[grt (UTC plus 2), 2012/11/16 14:14:59]

sgtm

[erikwright (departed), 2012/11/20 20:14:30]

Done.

+      !installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
+    if (archive_path != archive_dst) {
+      // In the past, we copied rather than moved for system level installs so
+      // that the permissions of %ProgramFiles% would be picked up.  Now that
+      // |temp_path| is in %ProgramFiles% for system level installs (and in
+      // %LOCALAPPDATA% otherwise), there is no need to do this for the archive.
+      // Setup.exe, on the other hand, is created elsewhere so it must always be
+      // copied.
 #if !defined(COMPONENT_BUILD)
-    install_list->AddMoveTreeWorkItem(archive_path.value(), archive_dst.value(),
-                                      temp_path.value(), WorkItem::ALWAYS_MOVE);
+      install_list->AddMoveTreeWorkItem(archive_path.value(),
+                                        archive_dst.value(),
+                                        temp_path.value(),
+                                        WorkItem::ALWAYS_MOVE);
 #else  // COMPONENT_BUILD
-    // The archive is usually extracted in |temp_path| in which case we want to
-    // move it as mentioned above; however in the component build, setup.exe
-    // uses chrome.7z directly from the build output, moving it means that
-    // setup.exe cannot be run again without regenerating the archive, so copy
-    // it instead in this case to save developer time.
-    install_list->AddCopyTreeWorkItem(archive_path.value(), archive_dst.value(),
-                                      temp_path.value(), WorkItem::ALWAYS);
+      // The archive is usually extracted in |temp_path| in which case we want
+      // to move it as mentioned above; however in the component build,
+      // setup.exe uses chrome.7z directly from the build output, moving it
+      // means that setup.exe cannot be run again without regenerating the
+      // archive, so copy it instead in this case to save developer time.
+      install_list->AddCopyTreeWorkItem(archive_path.value(),
+                                        archive_dst.value(),
+                                        temp_path.value(),
+                                        WorkItem::ALWAYS);
 #endif  // COMPONENT_BUILD
+    }
   }
 }
 
 void AddInstallAppCommandWorkItems(const InstallerState& installer_state,
                                    const InstallationState& machine_state,
                                    const FilePath& setup_path,
                                    const Version& new_version,
                                    const Product& product,
                                    WorkItemList* work_item_list) {
   DCHECK(product.is_chrome_app_host());
@@ skipping 201 matching lines @@
       src_path.AppendASCII(new_version.GetString()).value(),
       target_path.AppendASCII(new_version.GetString()).value(),
       temp_path.value(),
       check_for_duplicates ? WorkItem::CHECK_DUPLICATES :
                              WorkItem::ALWAYS_MOVE);
 
   // 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);
 }
 
 // Probes COM machinery to get an instance of delegate_execute.exe's
 // CommandExecuteImpl class.  This is required so that COM purges its cache of
 // the path to the binary, which changes on updates.  This callback
 // unconditionally returns true since an install should not be aborted if the
 // probe fails.
 bool ProbeCommandExecuteCallback(const string16& command_execute_id,
                                  const CallbackWorkItem& work_item) {
   // Noop on rollback.
@@ skipping 651 matching lines @@
 
   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"");
   }
 
+  // Copy installer in install directory
+  AddInstallerCopyTasks(installer_state, setup_path, archive_path, temp_path,
+                        new_version, install_list);
+
   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 (Products::const_iterator it = products.begin(); it < products.end();
        ++it) {
     const Product& product = **it;
 
@@ skipping 515 matching lines @@
     // Log everything for now.
     cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
 
     AppCommand cmd(cmd_line.GetCommandLineString());
     cmd.set_is_auto_run_on_os_upgrade(true);
     cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list);
   }
 }
 
 }  // namespace installer