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

chrome/installer/util/installation_validator.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 #define CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 17 matching lines @@
  public:
   class ProductBits {
    public:
     // Bits that form the components of an installation type.
     enum {
       CHROME_SINGLE           = 0x01,
       CHROME_MULTI            = 0x02,
       CHROME_FRAME_SINGLE     = 0x04,
       CHROME_FRAME_MULTI      = 0x08,
       CHROME_FRAME_READY_MODE = 0x10,
+      CHROME_APP_HOST         = 0x20,
     };
   };  // class ProductBits
 
   // Identifiers of all valid installation types.
   enum InstallationType {
     NO_PRODUCTS = 0,
     CHROME_SINGLE =
         ProductBits::CHROME_SINGLE,
     CHROME_MULTI =
         ProductBits::CHROME_MULTI,
     CHROME_FRAME_SINGLE =
         ProductBits::CHROME_FRAME_SINGLE,
     CHROME_FRAME_SINGLE_CHROME_SINGLE =
         ProductBits::CHROME_FRAME_SINGLE | ProductBits::CHROME_SINGLE,
     CHROME_FRAME_SINGLE_CHROME_MULTI =
         ProductBits::CHROME_FRAME_SINGLE | ProductBits::CHROME_MULTI,
     CHROME_FRAME_MULTI =
         ProductBits::CHROME_FRAME_MULTI,
     CHROME_FRAME_MULTI_CHROME_MULTI =
         ProductBits::CHROME_FRAME_MULTI | ProductBits::CHROME_MULTI,
     CHROME_FRAME_READY_MODE_CHROME_MULTI =
         ProductBits::CHROME_FRAME_READY_MODE | ProductBits::CHROME_MULTI,
+    CHROME_APP_HOST =
+        ProductBits::CHROME_APP_HOST,
+    CHROME_APP_HOST_CHROME_FRAME_SINGLE =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_FRAME_SINGLE,
+    CHROME_APP_HOST_CHROME_FRAME_SINGLE_CHROME_MULTI =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_FRAME_SINGLE |
+        ProductBits::CHROME_MULTI,
+    CHROME_APP_HOST_CHROME_FRAME_MULTI =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_FRAME_MULTI,
+    CHROME_APP_HOST_CHROME_FRAME_MULTI_CHROME_MULTI =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_FRAME_MULTI |
+        ProductBits::CHROME_MULTI,
+    CHROME_APP_HOST_CHROME_MULTI =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_MULTI,
+    CHROME_APP_HOST_CHROME_MULTI_CHROME_FRAME_READY_MODE =
+        ProductBits::CHROME_APP_HOST | ProductBits::CHROME_MULTI |
+        ProductBits::CHROME_FRAME_READY_MODE,
   };
 
   // Validates |machine_state| at user or system level, returning true if valid.
   // |type| is populated in either case, although it is a best-guess when the
   // method returns false.
   static bool ValidateInstallationTypeForState(
       const InstallationState& machine_state,
       bool system_level,
       InstallationType* type);
 
@@ skipping 58 matching lines @@
         SwitchExpectations* expectations) const OVERRIDE;
     virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual bool UsageStatsAllowed(
         const ProductState& product_state) const OVERRIDE;
   };
 
+  // Validation rules for Chrome App Host.
+  class ChromeAppHostRules : public ProductRules {
+   public:
+    virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
+    virtual void AddUninstallSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const OVERRIDE;
+    virtual void AddRenameSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const OVERRIDE;
+    virtual bool UsageStatsAllowed(
+        const ProductState& product_state) const OVERRIDE;
+  };
+
   // Validation rules for the multi-install Chrome binaries.
   class ChromeBinariesRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
     virtual void AddUninstallSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual bool UsageStatsAllowed(
         const ProductState& product_state) const OVERRIDE;
   };
 
   struct ProductContext {
     const InstallationState& machine_state;
     bool system_install;
     BrowserDistribution* dist;
     const ProductState& state;
     const ProductRules& rules;
   };
 
+  static void ValidateInstallAppCommand(const ProductContext& ctx,
+                                           const AppCommand& command,
+                                           bool* is_valid);
   static void ValidateQuickEnableCfCommand(const ProductContext& ctx,
                                            const AppCommand& command,
                                            bool* is_valid);
+  static void ValidateQuickEnableApplicationHostCommand(
+    const ProductContext& ctx,
+    const AppCommand& command,
+    bool* is_valid);
+
   static void ValidateAppCommandExpectations(
       const ProductContext& ctx,
       const CommandExpectations& expectations,
       bool* is_valid);
   static void ValidateBinariesCommands(const ProductContext& ctx,
                                        bool* is_valid);
   static void ValidateBinaries(const InstallationState& machine_state,
                                bool system_install,
                                const ProductState& binaries_state,
                                bool* is_valid);
@@ skipping 29 matching lines @@
   // A collection of all valid installation types.
   static const InstallationType kInstallationTypes[];
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstallationValidator);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_