chromium/src
0
Fork 0
Code Activity

Does not override default animation when closing a docked window

Browse Source 
BUG=317204

Review URL: https://codereview.chromium.org/68513003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234697 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
varkha@chromium.org
2013-11-13 01:29:52 +00:00
parent a962f84d3b
commit 8853b68929
1 changed files with 4 additions and 2 deletions

6
ash/wm/dock/docked_window_layout_manager.cc

@ -591,11 +591,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);
}