Implement installation of the Chrome App Host.

chrome/installer/util/browser_distribution.cc

Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index f958db84e1465fb694bc562ebc7cdc1212b9514b..1af51f2290862fd71bea961c3472c5cc33134f4a 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -19,8 +19,9 @@
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/chromium_binaries_distribution.h"
-#include "chrome/installer/util/google_chrome_distribution.h"
+#include "chrome/installer/util/chrome_app_host_distribution.h"

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

ordering

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

Done.

 #include "chrome/installer/util/google_chrome_binaries_distribution.h"
+#include "chrome/installer/util/google_chrome_distribution.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
@@ -44,6 +45,7 @@ const wchar_t kICommandExecuteImplUuid[] =
 BrowserDistribution* g_browser_distribution = NULL;
 BrowserDistribution* g_chrome_frame_distribution = NULL;
 BrowserDistribution* g_binaries_distribution = NULL;
+BrowserDistribution* g_chrome_app_host_distribution = NULL;
 
 // Returns true if currently running in npchrome_frame.dll
 bool IsChromeFrameModule() {
@@ -54,12 +56,14 @@ bool IsChromeFrameModule() {
 }
 
 BrowserDistribution::Type GetCurrentDistributionType() {
-  static BrowserDistribution::Type type =
-      (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||
-       IsChromeFrameModule()) ?
-          BrowserDistribution::CHROME_FRAME :
-          BrowserDistribution::CHROME_BROWSER;
-  return type;
+  // TODO(erikwright): If the app host is installed, but not Chrome, perhaps
+  // this should return CHROME_APP_HOST.
+  if (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||

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

did you intentionally change this so that it no longer caches the value?  i
don't think we want to do this computation on each call.

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

No. Fixed.

+      IsChromeFrameModule()) {
+    return BrowserDistribution::CHROME_FRAME;
+  } else {
+    return BrowserDistribution::CHROME_BROWSER;
+  }
 }
 
 }  // end namespace
@@ -69,6 +73,7 @@ BrowserDistribution::Type GetCurrentDistributionType() {
 const BrowserDistribution::Type BrowserDistribution::kProductTypes[] = {

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

please check to see if it now makes sense for kProductTypes to go away and for
all of its users to be converted to simply iterating over the
BrowserDistribution::Type values from 0 to (but not including)
BrowserDistribution::NUM_TYPES.  i think it does.  AddExistingMultiInstalls, for
example, looks like it should now include the binaries so that they are added to
the set of products being operated on.

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

Done.

   BrowserDistribution::CHROME_BROWSER,
   BrowserDistribution::CHROME_FRAME,
+  BrowserDistribution::CHROME_APP_HOST,
 };
 
 const size_t BrowserDistribution::kNumProductTypes =
@@ -126,6 +131,11 @@ BrowserDistribution* BrowserDistribution::GetSpecificDistribution(
           &g_chrome_frame_distribution);
       break;
 
+    case CHROME_APP_HOST:
+      dist = GetOrCreateBrowserDistribution<ChromeAppHostDistribution>(
+          &g_chrome_app_host_distribution);
+      break;
+
     default:
       DCHECK_EQ(CHROME_BINARIES, type);
 #if defined(GOOGLE_CHROME_BUILD)