Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/util/browser_distribution.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 defines a class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/env_vars.h"
+#include "chrome/installer/util/chrome_app_host_distribution.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/chromium_binaries_distribution.h"
+#include "chrome/installer/util/google_chrome_binaries_distribution.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
-#include "chrome/installer/util/google_chrome_binaries_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"
 #include "chrome/installer/util/master_preferences.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 using installer::MasterPreferences;
 
 namespace {
 
 const wchar_t kCommandExecuteImplUuid[] =
     L"{A2DF06F9-A21A-44A8-8A99-8B9C84F29160}";
 const wchar_t kDelegateExecuteLibUuid[] =
     L"{7779FB70-B399-454A-AA1A-BAA850032B10}";
 const wchar_t kDelegateExecuteLibVersion[] = L"1.0";
 const wchar_t kICommandExecuteImplUuid[] =
     L"{0BA0D4E9-2259-4963-B9AE-A839F7CB7544}";
 
 // The BrowserDistribution objects are never freed.
 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() {
   FilePath module_path;
   PathService::Get(base::FILE_MODULE, &module_path);
   return FilePath::CompareEqualIgnoreCase(module_path.BaseName().value(),
                                           installer::kChromeFrameDll);
 }
 
 BrowserDistribution::Type GetCurrentDistributionType() {
+  // TODO(erikwright): If the app host is installed, but not Chrome, perhaps
+  // this should return CHROME_APP_HOST.
   static BrowserDistribution::Type type =
       (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||
        IsChromeFrameModule()) ?
           BrowserDistribution::CHROME_FRAME :
           BrowserDistribution::CHROME_BROWSER;
   return type;
 }
 
 }  // end namespace
 
-// CHROME_BINARIES represents the binaries shared by multi-install products and
-// is not a product in and of itself, so it is not present in this collection.
-const BrowserDistribution::Type BrowserDistribution::kProductTypes[] = {
-  BrowserDistribution::CHROME_BROWSER,
-  BrowserDistribution::CHROME_FRAME,
-};
-
-const size_t BrowserDistribution::kNumProductTypes =
-    arraysize(BrowserDistribution::kProductTypes);
-
 BrowserDistribution::BrowserDistribution()
     : type_(CHROME_BROWSER) {
 }
 
 BrowserDistribution::BrowserDistribution(Type type)
     : type_(type) {
 }
 
 template<class DistributionClass>
 BrowserDistribution* BrowserDistribution::GetOrCreateBrowserDistribution(
@@ skipping 32 matching lines @@
       dist = GetOrCreateBrowserDistribution<BrowserDistribution>(
           &g_browser_distribution);
 #endif
       break;
 
     case CHROME_FRAME:
       dist = GetOrCreateBrowserDistribution<ChromeFrameDistribution>(
           &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)
       dist = GetOrCreateBrowserDistribution<GoogleChromeBinariesDistribution>(
           &g_binaries_distribution);
 #else
       dist = GetOrCreateBrowserDistribution<ChromiumBinariesDistribution>(
           &g_binaries_distribution);
 #endif
   }
@@ skipping 131 matching lines @@
     const Version& version, const installer::Product& product,
     bool system_level) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor,
     const string16& experiment_group,
     const installer::Product& installation,
     const FilePath& application_path) {
 }