diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 20:19:47 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 20:19:47 +0000 |
| commit | c15d15684de184481066b875ca7bbc9829069274 (patch) | |
| tree | c52fdc9cf9bfd6083cda8e284bdde1936b1a2585 /ash/wm/window_animations.cc | |
| parent | 6714272cdb8fedfc02ec66483a0a2b8fbdab3cf6 (diff) | |
| download | chromium_src-c15d15684de184481066b875ca7bbc9829069274.zip chromium_src-c15d15684de184481066b875ca7bbc9829069274.tar.gz chromium_src-c15d15684de184481066b875ca7bbc9829069274.tar.bz2 | |
Reland 120074 -- Disable animations during aura tests.
This causes all animations scheduled during a test to complete immediately.
After making this change, I noticed some code assumed that animations would not complete synchronously. Some of this code used animation observers, and I while fixing the code I have updated it to use the preferred ImplicitAnimationObserver.
BUG=None
TEST=aura_shell_unittests,aura_unittests,compositor_unittests
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120074
Review URL: https://chromiumcodereview.appspot.com/9222018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_animations.cc')
| -rw-r--r-- | ash/wm/window_animations.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 8b8c0b1..5c4c3a4 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -171,7 +171,8 @@ void AnimateHideWindowCommon(aura::Window* window, // Property sets within this scope will be implicitly animated. ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator()); - settings.AddImplicitObserver(new HidingWindowAnimationObserver(window)); + settings.AddObserver(new HidingWindowAnimationObserver(window)); + int duration = window->GetIntProperty(internal::kWindowVisibilityAnimationDurationKey); if (duration > 0) { |