| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ | 5 #ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ |
| 6 #define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ | 6 #define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/memory/scoped_vector.h" | |
| 11 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 12 | 11 |
| 13 #include "ui/compositor/compositor_export.h" | 12 #include "ui/compositor/compositor_export.h" |
| 14 #include "ui/compositor/layer_animator.h" | 13 #include "ui/compositor/layer_animator.h" |
| 15 #include "ui/gfx/animation/tween.h" | 14 #include "ui/gfx/animation/tween.h" |
| 16 | 15 |
| 17 namespace ui { | 16 namespace ui { |
| 18 | 17 |
| 19 class ImplicitAnimationObserver; | 18 class ImplicitAnimationObserver; |
| 20 class LayerAnimationObserver; | 19 class LayerAnimationObserver; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 LayerAnimator::PreemptionStrategy old_preemption_strategy_; | 61 LayerAnimator::PreemptionStrategy old_preemption_strategy_; |
| 63 std::set<ImplicitAnimationObserver*> observers_; | 62 std::set<ImplicitAnimationObserver*> observers_; |
| 64 scoped_ptr<InvertingObserver> inverse_observer_; | 63 scoped_ptr<InvertingObserver> inverse_observer_; |
| 65 | 64 |
| 66 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings); | 65 DISALLOW_COPY_AND_ASSIGN(ScopedLayerAnimationSettings); |
| 67 }; | 66 }; |
| 68 | 67 |
| 69 } // namespace ui | 68 } // namespace ui |
| 70 | 69 |
| 71 #endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ | 70 #endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ |
| OLD | NEW |