| Index: chrome/installer/util/installation_validator.h
|
| diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h
|
| index 846d4e6a375897847d9e4d2a418bc1d41cc42713..087824ac4ed3efeb3943e80aa227ad83d959637b 100644
|
| --- a/chrome/installer/util/installation_validator.h
|
| +++ b/chrome/installer/util/installation_validator.h
|
| @@ -114,53 +114,53 @@ class InstallationValidator {
|
| // Validation rules for the Chrome browser.
|
| class ChromeRules : public ProductRules {
|
| public:
|
| - virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
|
| + virtual BrowserDistribution::Type distribution_type() const override;
|
| virtual void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| virtual void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| + virtual 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 BrowserDistribution::Type distribution_type() const override;
|
| virtual void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| virtual void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| + virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| };
|
|
|
| // Validation rules for Chrome App Host.
|
| class ChromeAppHostRules : public ProductRules {
|
| public:
|
| - virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
|
| + virtual BrowserDistribution::Type distribution_type() const override;
|
| virtual void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| virtual void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| + virtual 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 BrowserDistribution::Type distribution_type() const override;
|
| virtual void AddUninstallSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| virtual void AddRenameSwitchExpectations(
|
| const ProductContext& ctx,
|
| - SwitchExpectations* expectations) const OVERRIDE;
|
| - virtual bool UsageStatsAllowed(const ProductContext& ctx) const OVERRIDE;
|
| + SwitchExpectations* expectations) const override;
|
| + virtual bool UsageStatsAllowed(const ProductContext& ctx) const override;
|
| };
|
|
|
| struct ProductContext {
|
|
|