diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 02:04:41 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-02 02:04:41 +0000 |
| commit | 30676816756930d0b37da9caf9c4433a3dd51725 (patch) | |
| tree | 8f303bda2ded29d80a5de675fe63291da2cafe5f /ui/aura/root_window.h | |
| parent | 9860c68b6cba0cdeed285276e96356a3acfb08e6 (diff) | |
| download | chromium_src-30676816756930d0b37da9caf9c4433a3dd51725.zip chromium_src-30676816756930d0b37da9caf9c4433a3dd51725.tar.gz chromium_src-30676816756930d0b37da9caf9c4433a3dd51725.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120092
Review URL: https://chromiumcodereview.appspot.com/9222018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.h')
| -rw-r--r-- | ui/aura/root_window.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index ec0f09f..4f5bd4f 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -219,11 +219,11 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, // Overridden from ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( - const ui::LayerAnimationSequence* animation) OVERRIDE; + ui::LayerAnimationSequence* animation) OVERRIDE; virtual void OnLayerAnimationScheduled( - const ui::LayerAnimationSequence* animation) OVERRIDE; + ui::LayerAnimationSequence* animation) OVERRIDE; virtual void OnLayerAnimationAborted( - const ui::LayerAnimationSequence* animation) OVERRIDE; + ui::LayerAnimationSequence* animation) OVERRIDE; // Overridden from FocusManager: virtual void SetFocusedWindow(Window* window) OVERRIDE; |