| Index: ash/default_user_wallpaper_delegate.h
|
| diff --git a/ash/default_user_wallpaper_delegate.h b/ash/default_user_wallpaper_delegate.h
|
| index 42fb1a35c2ef76944c637d64f3fd3af1417afdb2..fbbccde78b41ec25ac44925e0d8f93dc8cc2c969 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);
|
|
|