Index: ash/desktop_background/desktop_background_view.cc |
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc |
index 6a7bf82a1f7bcc91f1c60919b637de66c8a6bc85..acf4e3bcded7bee2f71140fc607c69df9916b0d0 100644 |
--- a/ash/desktop_background/desktop_background_view.cc |
+++ b/ash/desktop_background/desktop_background_view.cc |
@@ -207,6 +207,12 @@ views::Widget* CreateDesktopBackground(aura::Window* root_window, |
Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) { |
views::corewm::SetWindowVisibilityAnimationTransition( |
desktop_widget->GetNativeView(), views::corewm::ANIMATE_SHOW); |
+ int duration_override = wallpaper_delegate->GetAnimationDurationOverride(); |
+ if (duration_override) { |
+ views::corewm::SetWindowVisibilityAnimationDuration( |
+ desktop_widget->GetNativeView(), |
+ base::TimeDelta::FromMilliseconds(duration_override)); |
+ } |
} else { |
// Disable animation if transition to login screen from an empty background. |
views::corewm::SetWindowVisibilityAnimationTransition( |