Does not override default animation when closing a docked window

ash/wm/dock/docked_window_layout_manager.cc

Index: ash/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index f244f1c902be6a22962f5f75357da01eaa9366fc..f3d1b6c4ac53e10b51894d74f0b7b000bdc2c5a6 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -601,9 +601,10 @@ void DockedWindowLayoutManager::OnWindowVisibilityChanging(
     aura::Window* window, bool visible) {
   if (IsPopupOrTransient(window))
     return;
-  int animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE;
+  int animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT;
+  if (!visible && wm::GetWindowState(window)->IsMinimized())
+    animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE;
   if (visible) {
-    animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT;
     views::corewm::SetWindowVisibilityAnimationDuration(
         window, base::TimeDelta::FromMilliseconds(kFadeDurationMs));

[pkotwicz, 2013/11/11 18:10:51]

You should be explicit about the animation type you want in the |visible| case.
(Things would not work as expected if someone changed the default animation
type)

[varkha, 2013/11/11 20:18:30]

Done (I think). This is matching the type set in
GetWindowVisibilityAnimationType().

   }