Implement installation of the Chrome App Host.

chrome/installer/util/installer_state.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 "chrome/installer/util/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 93 matching lines @@
     verbose_logging_ = false;
 
   if (!prefs.GetBool(master_preferences::kMultiInstall, &pref_bool))
     pref_bool = false;
   set_package_type(pref_bool ? MULTI_PACKAGE : SINGLE_PACKAGE);
 
   if (!prefs.GetBool(master_preferences::kMsi, &msi_))
     msi_ = false;
 
   const bool is_uninstall = command_line.HasSwitch(switches::kUninstall);
 

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

suggestion: add this here
  const wchar_t* const operation = (is_uninstall ? "Uninstall" : "Install");
and then use |operation| in the log messages below

   if (prefs.install_chrome()) {
     Product* p =
         AddProductFromPreferences(BrowserDistribution::CHROME_BROWSER, prefs,
                                   machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
   if (prefs.install_chrome_frame()) {
     Product* p =
         AddProductFromPreferences(BrowserDistribution::CHROME_FRAME, prefs,
                                   machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
             << " distribution: " << p->distribution()->GetAppShortCutName();
   }
+  if (prefs.install_chrome_app_host()) {
+    Product* p =
+        AddProductFromPreferences(BrowserDistribution::CHROME_APP_HOST, prefs,
+                                  machine_state);
+    VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
+            << " distribution: " << p->distribution()->GetAppShortCutName();
+  }
 
+  if (is_uninstall && prefs.is_multi_install()) {
+    bool keep_binaries = false;
+    // Look for a product that is not the binaries and that is not being
+    // uninstalled. If not found, binaries are uninstalled too.
+    for (size_t i = 0; i < BrowserDistribution::kNumProductTypes; ++i) {
+      if (BrowserDistribution::kProductTypes[i] ==
+          BrowserDistribution::CHROME_BINARIES) {
+        continue;
+      }
+
+      if (machine_state.GetProductState(
+              system_install(),
+              BrowserDistribution::kProductTypes[i]) == NULL) {
+        // The product is not installed.
+        continue;
+      }
+
+      // The product is installed.
+
+      if (!FindProduct(BrowserDistribution::kProductTypes[i])) {
+        // The product is not being uninstalled.
+        keep_binaries = true;
+        break;
+      }
+
+      // The product is being uninstalled.
+    }
+    if (!keep_binaries) {
+      Product* p =
+          AddProductFromPreferences(BrowserDistribution::CHROME_BINARIES, prefs,
+                                    machine_state);
+      VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
+              << " distribution: " << p->distribution()->GetAppShortCutName();
+    }
+  }
+
   BrowserDistribution* operand = NULL;
 
   if (is_uninstall) {
     operation_ = UNINSTALL;
   } else if (!prefs.is_multi_install()) {
     // For a single-install, the current browser dist is the operand.
     operand = BrowserDistribution::GetDistribution();
     operation_ = SINGLE_INSTALL_OR_UPDATE;
   } else if (IsMultiInstallUpdate(prefs, machine_state)) {
     // Updates driven by Google Update take place under the multi-installer's
     // app guid.
     operand = multi_package_distribution_;
     operation_ = MULTI_UPDATE;
   } else {
     // Initial and over installs will always take place under one of the
     // product app guids.  Chrome Frame's will be used if only Chrome Frame

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

is this comment out of date now?  is there such thing as an initial install or
over install driven by Google Update of the app host alone (i think the answer
is yes)?

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

Not driven by Google Update per se, but the App Host at user-level can be
installed via an application command.

     // is being installed.  In all other cases, Chrome's is used.
     operation_ = MULTI_INSTALL;
   }
 
   if (operand == NULL) {
+    BrowserDistribution::Type operand_distribution_type =
+        BrowserDistribution::CHROME_BINARIES;
+    if (prefs.install_chrome())
+      operand_distribution_type = BrowserDistribution::CHROME_BROWSER;
+    else if (prefs.install_chrome_frame())
+      operand_distribution_type = BrowserDistribution::CHROME_FRAME;
+    else if (prefs.install_chrome_app_host())
+      operand_distribution_type = BrowserDistribution::CHROME_APP_HOST;
+    else
+      NOTREACHED();
+        
     operand = BrowserDistribution::GetSpecificDistribution(
-        prefs.install_chrome() ?
-            BrowserDistribution::CHROME_BROWSER :
-            BrowserDistribution::CHROME_FRAME);
+        operand_distribution_type);
   }
 
   state_key_ = operand->GetStateKey();
   state_type_ = operand->GetType();
 
   // Parse --critical-update-version=W.X.Y.Z
   std::string critical_version_value(
       command_line.GetSwitchValueASCII(switches::kCriticalUpdateVersion));
   critical_update_version_ = Version(critical_version_value);
 }
@@ skipping 452 matching lines @@
   if (is_multi_install()) {
     InstallUtil::AddInstallerResultItems(
         system_install, multi_package_binaries_distribution()->GetStateKey(),
         status, string_resource_id, launch_cmd, install_list.get());
   }
   if (!install_list->Do())
     LOG(ERROR) << "Failed to record installer error information in registry.";
 }
 
 }  // namespace installer