| Index: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| index f931995ebd8ec6de8df5b3191f8752572954d312..a4dcf449e0deb84ff883a340cd48ed06fd32d283 100644
|
| --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| @@ -40,7 +40,9 @@ bool IsNormalWallpaperChange() {
|
|
|
| class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| public:
|
| - UserWallpaperDelegate() : boot_animation_finished_(false) {
|
| + UserWallpaperDelegate()
|
| + : boot_animation_finished_(false),
|
| + animation_duration_override_in_ms_(0) {
|
| }
|
|
|
| virtual ~UserWallpaperDelegate() {
|
| @@ -52,6 +54,15 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| static_cast<int>(views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| }
|
|
|
| + virtual int GetAnimationDurationOverride() OVERRIDE {
|
| + return animation_duration_override_in_ms_;
|
| + }
|
| +
|
| + virtual void SetAnimationDurationOverride(
|
| + int animation_duration_in_ms) OVERRIDE {
|
| + animation_duration_override_in_ms_ = animation_duration_in_ms;
|
| + }
|
| +
|
| virtual bool ShouldShowInitialAnimation() OVERRIDE {
|
| if (IsNormalWallpaperChange() || boot_animation_finished_)
|
| return false;
|
| @@ -103,6 +114,9 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| private:
|
| bool boot_animation_finished_;
|
|
|
| + // The animation duration to show a new wallpaper if an animation is required.
|
| + int animation_duration_override_in_ms_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
|
| };
|
|
|
|
|