diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:55:54 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:55:54 +0000 |
| commit | 9db1e2bd1fbb73b83c85f1b76f98666e9fa4fbc8 (patch) | |
| tree | 037fb934b87d71fcb035b0375ba020ab42ef365f /ash/wm | |
| parent | ff4d21946707c6c67f4e94c5bc1452d539e498ae (diff) | |
| download | chromium_src-9db1e2bd1fbb73b83c85f1b76f98666e9fa4fbc8.zip chromium_src-9db1e2bd1fbb73b83c85f1b76f98666e9fa4fbc8.tar.gz chromium_src-9db1e2bd1fbb73b83c85f1b76f98666e9fa4fbc8.tar.bz2 | |
Do not CrossFade on restore to side-maximized.
BUG=293027
R=oshima@chromium.org
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/23591063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_layout_manager.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 6d2ff18..d1219ad 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -310,11 +310,13 @@ void WorkspaceLayoutManager::UpdateBoundsFromShowState( bounds_in_parent.SetRect(0, 0, 0, 0); } if (!bounds_in_parent.IsEmpty()) { - CrossFadeToBounds( - window, - BaseLayoutManager::BoundsWithScreenEdgeVisible( - window->parent()->parent(), - bounds_in_parent)); + gfx::Rect new_bounds = BaseLayoutManager::BoundsWithScreenEdgeVisible( + window->parent()->parent(), + bounds_in_parent); + if (last_show_state == ui::SHOW_STATE_MINIMIZED) + SetChildBoundsDirect(window, new_bounds); + else + CrossFadeToBounds(window, new_bounds); } ClearRestoreBounds(window); break; |