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..11fa85f3a738b541c0b6f095280623b541ff3a59 100644 |
--- a/ash/wm/dock/docked_window_layout_manager.cc |
+++ b/ash/wm/dock/docked_window_layout_manager.cc |
@@ -601,11 +601,13 @@ 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) { |
- animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT; |
+ animation_type = views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DROP; |
views::corewm::SetWindowVisibilityAnimationDuration( |
window, base::TimeDelta::FromMilliseconds(kFadeDurationMs)); |
+ } else if (wm::GetWindowState(window)->IsMinimized()) { |
+ animation_type = WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE; |
} |
views::corewm::SetWindowVisibilityAnimationType(window, animation_type); |
} |