| 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 d91d717b293d759451285eb875d472df989b83a8..670ab59f0e1e9e50b43bd206180dd4072154df5b 100644
|
| --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/desktop_background/user_wallpaper_delegate.h"
|
| #include "ash/shell.h"
|
| +#include "ash/wm/common/window_animation_types.h"
|
| #include "ash/wm/window_animations.h"
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| @@ -48,9 +49,9 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
|
| ~UserWallpaperDelegate() override {}
|
|
|
| int GetAnimationType() override {
|
| - return ShouldShowInitialAnimation() ?
|
| - ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
|
| - static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| + return ShouldShowInitialAnimation()
|
| + ? ash::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE
|
| + : static_cast<int>(::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| }
|
|
|
| int GetAnimationDurationOverride() override {
|
|
|