Chromium Code Reviews| Index: ui/gfx/compositor/test_layer_animation_delegate.h |
| diff --git a/ui/gfx/compositor/dummy_layer_animation_delegate.h b/ui/gfx/compositor/test_layer_animation_delegate.h |
| similarity index 63% |
| rename from ui/gfx/compositor/dummy_layer_animation_delegate.h |
| rename to ui/gfx/compositor/test_layer_animation_delegate.h |
| index 69b643513d370c5ca0c3e864dbb870a3abfb82bb..c75d2b1a3ff65472edae0d92b1b1b575f1e28eb6 100644 |
| --- a/ui/gfx/compositor/dummy_layer_animation_delegate.h |
| +++ b/ui/gfx/compositor/test_layer_animation_delegate.h |
| @@ -2,26 +2,26 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_ |
| -#define UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_ |
| +#ifndef UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_ |
| +#define UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_ |
| #pragma once |
| #include "base/compiler_specific.h" |
| #include "ui/gfx/rect.h" |
| #include "ui/gfx/transform.h" |
| #include "ui/gfx/compositor/compositor_export.h" |
| -#include "ui/gfx/compositor/layer_animator_delegate.h" |
| +#include "ui/gfx/compositor/layer_animation_delegate.h" |
| namespace ui { |
| class LayerAnimationSequence; |
| -class COMPOSITOR_EXPORT DummyLayerAnimationDelegate |
| - : public LayerAnimatorDelegate { |
| +class COMPOSITOR_EXPORT TestLayerAnimationDelegate |
| + : public LayerAnimationDelegate { |
| public: |
| - DummyLayerAnimationDelegate(); |
| - DummyLayerAnimationDelegate(const LayerAnimationDelegate& other); |
| - virtual ~DummyLayerAnimationDelegate(); |
| + TestLayerAnimationDelegate(); |
| + TestLayerAnimationDelegate(const LayerAnimationDelegate& other); |
|
sky
2011/10/28 22:11:38
explicit
|
| + virtual ~TestLayerAnimationDelegate(); |
| // Implementation of LayerAnimationDelegate |
| virtual void SetBoundsFromAnimation(const gfx::Rect& bounds) OVERRIDE; |
| @@ -32,9 +32,6 @@ class COMPOSITOR_EXPORT DummyLayerAnimationDelegate |
| virtual const Transform& GetTransformForAnimation() const OVERRIDE; |
| virtual float GetOpacityForAnimation() const OVERRIDE; |
| - // Implementation of LayerAnimatorDelegate |
| - virtual void OnLayerAnimationEnded(LayerAnimationSequence* sequence) OVERRIDE; |
| - |
| private: |
| gfx::Rect bounds_; |
| Transform transform_; |
| @@ -45,4 +42,4 @@ class COMPOSITOR_EXPORT DummyLayerAnimationDelegate |
| } // namespace ui |
| -#endif // UI_GFX_COMPOSITOR_DUMMY_LAYER_ANIMATION_DELEGATE_H_ |
| +#endif // UI_GFX_COMPOSITOR_TEST_LAYER_ANIMATION_DELEGATE_H_ |