| Index: chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
|
| index c09ef576c1140667c6ef224df2d7278402def8d0..43ff95a71f17624ab23cea16858426aa275a7af1 100644
|
| --- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
|
| +++ b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/desktop_background/desktop_background_controller.h"
|
| #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/macros.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -25,9 +26,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);
|
| }
|
|
|
| bool ShouldShowInitialAnimation() override { return true; }
|
|
|