diff options
| author | nick <nick@chromium.org> | 2015-04-28 10:22:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 17:22:53 +0000 |
| commit | 79ff566325268a34a0ce078dbda3ea68d21850de (patch) | |
| tree | f1d206fd222c18ae5f581a879ea7fbb8c4e51aad /components/data_reduction_proxy | |
| parent | f9f4834d3690715c918eaaea589f18472e95ebd9 (diff) | |
| download | chromium_src-79ff566325268a34a0ce078dbda3ea68d21850de.zip chromium_src-79ff566325268a34a0ce078dbda3ea68d21850de.tar.gz chromium_src-79ff566325268a34a0ce078dbda3ea68d21850de.tar.bz2 | |
Update {virtual,override} to follow C++11 style in components.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.
This patch was manually generated using a regex and a text editor.
BUG=417463
Review URL: https://codereview.chromium.org/1056633004
Cr-Commit-Position: refs/heads/master@{#327312}
Diffstat (limited to 'components/data_reduction_proxy')
| -rw-r--r-- | components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h index dc5ec7f..12ef1f7 100644 --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h @@ -98,11 +98,11 @@ class ConcreteDataReductionProxySettingsTest : public DataReductionProxySettingsTestBase { public: typedef MockDataReductionProxySettings<C> MockSettings; - virtual void ResetSettings(bool allowed, - bool fallback_allowed, - bool alt_allowed, - bool promo_allowed, - bool holdback) override { + void ResetSettings(bool allowed, + bool fallback_allowed, + bool alt_allowed, + bool promo_allowed, + bool holdback) override { return DataReductionProxySettingsTestBase::ResetSettings<C>( allowed, fallback_allowed, alt_allowed, promo_allowed, holdback); } |