| OLD | NEW |
| 1 // Copyright (c) 2010 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 APP_MULTI_ANIMATION_H_ | 5 #ifndef UI_BASE_ANIMATION_MULTI_ANIMATION_H_ |
| 6 #define APP_MULTI_ANIMATION_H_ | 6 #define UI_BASE_ANIMATION_MULTI_ANIMATION_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "app/animation.h" | 11 #include "ui/base/animation/animation.h" |
| 12 #include "app/tween.h" | 12 #include "ui/base/animation/tween.h" |
| 13 |
| 14 namespace ui { |
| 13 | 15 |
| 14 // MultiAnimation is an animation that consists of a number of sub animations. | 16 // MultiAnimation is an animation that consists of a number of sub animations. |
| 15 // To create a MultiAnimation pass in the parts, invoke Start() and the delegate | 17 // To create a MultiAnimation pass in the parts, invoke Start() and the delegate |
| 16 // is notified as the animation progresses. By default MultiAnimation runs until | 18 // is notified as the animation progresses. By default MultiAnimation runs until |
| 17 // Stop is invoked, see |set_continuous()| for details. | 19 // Stop is invoked, see |set_continuous()| for details. |
| 18 class MultiAnimation : public Animation { | 20 class MultiAnimation : public Animation { |
| 19 public: | 21 public: |
| 20 // Defines part of the animation. Each part consists of the following: | 22 // Defines part of the animation. Each part consists of the following: |
| 21 // | 23 // |
| 22 // time_ms: the time of the part. | 24 // time_ms: the time of the part. |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 | 82 |
| 81 // Index of the current part. | 83 // Index of the current part. |
| 82 size_t current_part_index_; | 84 size_t current_part_index_; |
| 83 | 85 |
| 84 // See description above setter. | 86 // See description above setter. |
| 85 bool continuous_; | 87 bool continuous_; |
| 86 | 88 |
| 87 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); | 89 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); |
| 88 }; | 90 }; |
| 89 | 91 |
| 90 #endif // APP_MULTI_ANIMATION_H_ | 92 } // namespace ui |
| 93 |
| 94 #endif // UI_BASE_ANIMATION_MULTI_ANIMATION_H_ |
| OLD | NEW |