summaryrefslogtreecommitdiffstats
path: root/ash/default_user_wallpaper_delegate.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:23:45 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:24:05 +0000
commit10d6b38a855066b1400d96d0600c6e2aec42cbf1 (patch)
tree8df573d9a31973c64cd9c50e9a2a6a6fa5c49e82 /ash/default_user_wallpaper_delegate.h
parent90b32ca95485409ba5646c96a4ec0aa4b6216aee (diff)
downloadchromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.zip
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.gz
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.bz2
replace OVERRIDE and FINAL with override and final in ash/
BUG=417463 Review URL: https://codereview.chromium.org/621133002 Cr-Commit-Position: refs/heads/master@{#298040}
Diffstat (limited to 'ash/default_user_wallpaper_delegate.h')
-rw-r--r--ash/default_user_wallpaper_delegate.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/ash/default_user_wallpaper_delegate.h b/ash/default_user_wallpaper_delegate.h
index ad7da6c..42fb1a3 100644
--- a/ash/default_user_wallpaper_delegate.h
+++ b/ash/default_user_wallpaper_delegate.h
@@ -18,17 +18,17 @@ class ASH_EXPORT DefaultUserWallpaperDelegate : public UserWallpaperDelegate {
virtual ~DefaultUserWallpaperDelegate() {}
// UserWallpaperDelegate overrides:
- virtual int GetAnimationType() OVERRIDE;
- virtual int GetAnimationDurationOverride() OVERRIDE;
+ 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 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;
private:
DISALLOW_COPY_AND_ASSIGN(DefaultUserWallpaperDelegate);