| Index: chrome/installer/util/installation_validator.h
|
| diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h
|
| index 28e7a83e6fbc608a001a09ce9b9cc3e953769024..b66a2535a2d96728592060064001d399a8c397ae 100644
|
| --- a/chrome/installer/util/installation_validator.h
|
| +++ b/chrome/installer/util/installation_validator.h
|
| @@ -99,40 +99,40 @@ class InstallationValidator {
|
| // Validation rules for the Chrome browser.
|
| class ChromeRules : public ProductRules {
|
| public:
|
| - virtual BrowserDistribution::Type distribution_type() const override;
|
| - virtual void AddUninstallSwitchExpectations(
|
| + BrowserDistribution::Type distribution_type() const override;
|
| + void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual void AddRenameSwitchExpectations(
|
| + void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| + bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| };
|
|
|
| // Validation rules for Chrome Frame.
|
| class ChromeFrameRules : public ProductRules {
|
| public:
|
| - virtual BrowserDistribution::Type distribution_type() const override;
|
| - virtual void AddUninstallSwitchExpectations(
|
| + BrowserDistribution::Type distribution_type() const override;
|
| + void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual void AddRenameSwitchExpectations(
|
| + void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| + bool UsageStatsAllowed(const ProductContext& ctx) 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(
|
| + BrowserDistribution::Type distribution_type() const override;
|
| + void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual void AddRenameSwitchExpectations(
|
| + void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| SwitchExpectations* expectations) const override;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| + bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| };
|
|
|
| struct ProductContext {
|
|
|