Callback flow to register Chrome and update shortcuts after OS upgrade to Windows 8

chrome/installer/util/installation_validator.h

 // 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>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/string16.h"
 #include "chrome/installer/util/browser_distribution.h"
 
 class CommandLine;
 class FilePath;
 
 namespace installer {
 
 class InstallationState;
 class AppCommand;
 class ProductState;
@@ skipping 65 matching lines @@
   // returning true and populating |type| if valid.
   static bool ValidateInstallationType(bool system_level,
                                        InstallationType* type);
 
  protected:
   struct ProductContext;
   typedef std::vector<std::pair<std::string, bool> > SwitchExpectations;
   typedef void (*CommandValidatorFn)(const ProductContext& ctx,
                                      const AppCommand& command,
                                      bool* is_valid);
-  typedef std::map<std::wstring, CommandValidatorFn> CommandExpectations;
+  typedef std::map<string16, CommandValidatorFn> CommandExpectations;
 
   // An interface to product-specific validation rules.
   class ProductRules {
    public:
     virtual ~ProductRules() { }
     virtual BrowserDistribution::Type distribution_type() const = 0;
     virtual void AddUninstallSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
@@ skipping 73 matching lines @@
     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 {
+    ProductContext(const InstallationState& machine_state_in,
+                   const bool system_install_in,

[gab, 2012/08/30 14:24:32]

chromium-style: Don't need to make POD type parameter const.

[huangs, 2012/08/30 17:13:07]

Done.

+                   const ProductState& state_in,
+                   const ProductRules& rules_in)
+        : machine_state(machine_state_in),
+          system_install(system_install_in),
+          dist(BrowserDistribution::GetSpecificDistribution(
+              rules_in.distribution_type())),
+          state(state_in),
+          rules(rules_in) {
+    }
+
     const InstallationState& machine_state;
     bool system_install;
     BrowserDistribution* dist;
     const ProductState& state;
     const ProductRules& rules;
   };
 
+  static void ValidateOnOsUpgradeCommand(const ProductContext& ctx,
+                                         const AppCommand& command,
+                                         bool* is_valid);
   static void ValidateInstallAppCommand(const ProductContext& ctx,
-                                           const AppCommand& command,
-                                           bool* is_valid);
+                                        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,
@@ skipping 21 matching lines @@
   static void ValidateRenameCommand(const ProductContext& ctx,
                                     bool* is_valid);
   static void ValidateOldVersionValues(const ProductContext& ctx,
                                        bool* is_valid);
   static void ValidateMultiInstallProduct(const ProductContext& ctx,
                                           bool* is_valid);
   static void ValidateAppCommands(const ProductContext& ctx,
                                   bool* is_valid);
   static void ValidateUsageStats(const ProductContext& ctx,
                                  bool* is_valid);
-  static void ValidateProduct(const InstallationState& machine_state,
-                              bool system_install,
-                              const ProductState& product_state,
-                              const ProductRules& rules,
+  static void ValidateProduct(const ProductContext& ctx,
                               bool* is_valid);
 
   // 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_