summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authorvarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 09:07:54 +0000
committervarkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-25 09:07:54 +0000
commit0d25f19ea68ed724b8027511ce469898c25fd1fa (patch)
treec2b90bc72adc7bd776731e190b77e71bafba277a /ash/wm
parentcf4a441c61ba1d3e3f0c335431908beebb4b6fff (diff)
downloadchromium_src-0d25f19ea68ed724b8027511ce469898c25fd1fa.zip
chromium_src-0d25f19ea68ed724b8027511ce469898c25fd1fa.tar.gz
chromium_src-0d25f19ea68ed724b8027511ce469898c25fd1fa.tar.bz2
Avoid hiding a docked window when it is going to get fullscreened
BUG=309955 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=230683 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=230922 Review URL: https://codereview.chromium.org/38603002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/dock/docked_window_layout_manager.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 3307d6c..a81ed97 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -110,7 +110,8 @@ void UndockWindow(aura::Window* window) {
aura::client::ParentWindowWithContext(window, window, gfx::Rect());
if (window->parent() != previous_parent)
wm::ReparentTransientChildrenOfChild(window->parent(), window);
- // Animate maximize animation from previous window bounds.
+ // Start maximize or fullscreen (affecting packaged apps) animation from
+ // previous window bounds.
window->layer()->SetBounds(previous_bounds);
}