diff options
| author | dcheng <dcheng@chromium.org> | 2015-01-15 16:48:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-16 00:49:19 +0000 |
| commit | 222b9c73256c2c8b2e119ca55cb8a8426b93d5db (patch) | |
| tree | abc1b73c9cc427b57cb9095a3926cabd4eb754a5 /ash/display/display_manager.h | |
| parent | ce340ea798bfd1b19700df5b82b56b1e96144369 (diff) | |
| download | chromium_src-222b9c73256c2c8b2e119ca55cb8a8426b93d5db.zip chromium_src-222b9c73256c2c8b2e119ca55cb8a8426b93d5db.tar.gz chromium_src-222b9c73256c2c8b2e119ca55cb8a8426b93d5db.tar.bz2 | |
Update {virtual,override,final} to follow C++11 style in ash.
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 automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.
BUG=417463
R=jamescook@chromium.org
Review URL: https://codereview.chromium.org/800983006
Cr-Commit-Position: refs/heads/master@{#311791}
Diffstat (limited to 'ash/display/display_manager.h')
| -rw-r--r-- | ash/display/display_manager.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h index d9e4efa..092d2b0 100644 --- a/ash/display/display_manager.h +++ b/ash/display/display_manager.h @@ -78,7 +78,11 @@ class ASH_EXPORT DisplayManager }; DisplayManager(); +#if defined(OS_CHROMEOS) + ~DisplayManager() override; +#else virtual ~DisplayManager(); +#endif DisplayLayoutStore* layout_store() { return layout_store_.get(); @@ -270,8 +274,8 @@ class ASH_EXPORT DisplayManager // SoftwareMirroringController override: #if defined(OS_CHROMEOS) - virtual void SetSoftwareMirroring(bool enabled) override; - virtual bool SoftwareMirroringEnabled() const override; + void SetSoftwareMirroring(bool enabled) override; + bool SoftwareMirroringEnabled() const override; #endif bool software_mirroring_enabled() const { return second_display_mode_ == MIRRORING; |