diff options
author | dcheng <dcheng@chromium.org> | 2014-10-27 16:57:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 23:58:04 +0000 |
commit | 1f4538e02ae35659abf7f9468639a1045924af50 (patch) | |
tree | 1e076638bbebe64689099c5ea5bd82bfa9c6b9aa /ash/default_user_wallpaper_delegate.h | |
parent | e19d49ab07f57c16eb6685e7394ac4902e53382c (diff) | |
download | chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.zip chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.tar.gz chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.tar.bz2 |
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=derat@chromium.org
Review URL: https://codereview.chromium.org/680153002
Cr-Commit-Position: refs/heads/master@{#301490}
Diffstat (limited to 'ash/default_user_wallpaper_delegate.h')
-rw-r--r-- | ash/default_user_wallpaper_delegate.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ash/default_user_wallpaper_delegate.h b/ash/default_user_wallpaper_delegate.h index 42fb1a3..fbbccde 100644 --- a/ash/default_user_wallpaper_delegate.h +++ b/ash/default_user_wallpaper_delegate.h @@ -15,20 +15,19 @@ namespace ash { class ASH_EXPORT DefaultUserWallpaperDelegate : public UserWallpaperDelegate { public: DefaultUserWallpaperDelegate() {} - virtual ~DefaultUserWallpaperDelegate() {} + ~DefaultUserWallpaperDelegate() override {} // UserWallpaperDelegate overrides: - virtual int GetAnimationType() override; - virtual int GetAnimationDurationOverride() override; - virtual void SetAnimationDurationOverride( - int animation_duration_in_ms) override; - virtual bool ShouldShowInitialAnimation() override; - virtual void UpdateWallpaper(bool clear_cache) override; - virtual void InitializeWallpaper() override; - virtual void OpenSetWallpaperPage() override; - virtual bool CanOpenSetWallpaperPage() override; - virtual void OnWallpaperAnimationFinished() override; - virtual void OnWallpaperBootAnimationFinished() override; + int GetAnimationType() override; + int GetAnimationDurationOverride() override; + void SetAnimationDurationOverride(int animation_duration_in_ms) override; + bool ShouldShowInitialAnimation() override; + void UpdateWallpaper(bool clear_cache) override; + void InitializeWallpaper() override; + void OpenSetWallpaperPage() override; + bool CanOpenSetWallpaperPage() override; + void OnWallpaperAnimationFinished() override; + void OnWallpaperBootAnimationFinished() override; private: DISALLOW_COPY_AND_ASSIGN(DefaultUserWallpaperDelegate); |