diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 20:45:16 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 20:45:16 +0000 |
| commit | bc3d2110f80449765e8eebeffa4777f58a0b543a (patch) | |
| tree | ba7edf740c459421cfdce88e16160dfb9f4c1a27 /ash/wm/visibility_controller.cc | |
| parent | e137610304f8c72c439d2d1a7fd2f1a81efc2ef7 (diff) | |
| download | chromium_src-bc3d2110f80449765e8eebeffa4777f58a0b543a.zip chromium_src-bc3d2110f80449765e8eebeffa4777f58a0b543a.tar.gz chromium_src-bc3d2110f80449765e8eebeffa4777f58a0b543a.tar.bz2 | |
Acquire all layers when hiding window gets destroyed.
Add duration to show/hide animation (lock screen has longer animation)
Window can now specify in which visibility change phrase
it wants to animate (login screen and lock screen should animate only when hiding)
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9233044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/visibility_controller.cc')
| -rw-r--r-- | ash/wm/visibility_controller.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/wm/visibility_controller.cc b/ash/wm/visibility_controller.cc index 8006ff3..2fe55b8 100644 --- a/ash/wm/visibility_controller.cc +++ b/ash/wm/visibility_controller.cc @@ -35,8 +35,7 @@ void VisibilityController::UpdateLayerVisibility(aura::Window* window, bool animated = GetChildWindowVisibilityChangesAnimated(window->parent()) && window->type() != aura::client::WINDOW_TYPE_CONTROL && window->type() != aura::client::WINDOW_TYPE_UNKNOWN; - if (animated) - AnimateOnChildWindowVisibilityChanged(window, visible); + animated = animated && AnimateOnChildWindowVisibilityChanged(window, visible); // When a window is made visible, we always make its layer visible // immediately. When a window is hidden, the layer must be left visible and |