| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_GFX_ANIMATION_MULTI_ANIMATION_H_ | 5 #ifndef UI_GFX_ANIMATION_MULTI_ANIMATION_H_ |
| 6 #define UI_GFX_ANIMATION_MULTI_ANIMATION_H_ | 6 #define UI_GFX_ANIMATION_MULTI_ANIMATION_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 |
| 8 #include <vector> | 10 #include <vector> |
| 9 | 11 |
| 12 #include "base/macros.h" |
| 10 #include "ui/gfx/animation/animation.h" | 13 #include "ui/gfx/animation/animation.h" |
| 11 #include "ui/gfx/animation/tween.h" | 14 #include "ui/gfx/animation/tween.h" |
| 12 | 15 |
| 13 namespace gfx { | 16 namespace gfx { |
| 14 | 17 |
| 15 // MultiAnimation is an animation that consists of a number of sub animations. | 18 // MultiAnimation is an animation that consists of a number of sub animations. |
| 16 // To create a MultiAnimation pass in the parts, invoke Start() and the delegate | 19 // To create a MultiAnimation pass in the parts, invoke Start() and the delegate |
| 17 // is notified as the animation progresses. By default MultiAnimation runs until | 20 // is notified as the animation progresses. By default MultiAnimation runs until |
| 18 // Stop is invoked, see |set_continuous()| for details. | 21 // Stop is invoked, see |set_continuous()| for details. |
| 19 class GFX_EXPORT MultiAnimation : public Animation { | 22 class GFX_EXPORT MultiAnimation : public Animation { |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 90 |
| 88 // See description above setter. | 91 // See description above setter. |
| 89 bool continuous_; | 92 bool continuous_; |
| 90 | 93 |
| 91 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); | 94 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); |
| 92 }; | 95 }; |
| 93 | 96 |
| 94 } // namespace gfx | 97 } // namespace gfx |
| 95 | 98 |
| 96 #endif // UI_GFX_ANIMATION_MULTI_ANIMATION_H_ | 99 #endif // UI_GFX_ANIMATION_MULTI_ANIMATION_H_ |
| OLD | NEW |