| 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_GFX_ANIMATION_SLIDE_ANIMATION_H_ | 5 #ifndef UI_GFX_ANIMATION_SLIDE_ANIMATION_H_ |
| 6 #define UI_GFX_ANIMATION_SLIDE_ANIMATION_H_ | 6 #define UI_GFX_ANIMATION_SLIDE_ANIMATION_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "ui/gfx/animation/linear_animation.h" | 9 #include "ui/gfx/animation/linear_animation.h" |
| 10 #include "ui/gfx/animation/tween.h" | 10 #include "ui/gfx/animation/tween.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 // } else if (animation == other_animation_.get()) { | 36 // } else if (animation == other_animation_.get()) { |
| 37 // ... | 37 // ... |
| 38 // } | 38 // } |
| 39 // } | 39 // } |
| 40 // void Layout() { | 40 // void Layout() { |
| 41 // if (animation_->is_animating()) { | 41 // if (animation_->is_animating()) { |
| 42 // hover_image_.SetOpacity(animation_->GetCurrentValue()); | 42 // hover_image_.SetOpacity(animation_->GetCurrentValue()); |
| 43 // } | 43 // } |
| 44 // } | 44 // } |
| 45 // private: | 45 // private: |
| 46 // scoped_ptr<SlideAnimation> animation_; | 46 // std::unique_ptr<SlideAnimation> animation_; |
| 47 // } | 47 // } |
| 48 class GFX_EXPORT SlideAnimation : public LinearAnimation { | 48 class GFX_EXPORT SlideAnimation : public LinearAnimation { |
| 49 public: | 49 public: |
| 50 explicit SlideAnimation(AnimationDelegate* target); | 50 explicit SlideAnimation(AnimationDelegate* target); |
| 51 ~SlideAnimation() override; | 51 ~SlideAnimation() override; |
| 52 | 52 |
| 53 // Set the animation back to the 0 state. | 53 // Set the animation back to the 0 state. |
| 54 virtual void Reset(); | 54 virtual void Reset(); |
| 55 virtual void Reset(double value); | 55 virtual void Reset(double value); |
| 56 | 56 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 // How long a hover in/out animation will last for. This defaults to | 93 // How long a hover in/out animation will last for. This defaults to |
| 94 // kHoverFadeDurationMS, but can be overridden with SetDuration. | 94 // kHoverFadeDurationMS, but can be overridden with SetDuration. |
| 95 int slide_duration_; | 95 int slide_duration_; |
| 96 | 96 |
| 97 DISALLOW_COPY_AND_ASSIGN(SlideAnimation); | 97 DISALLOW_COPY_AND_ASSIGN(SlideAnimation); |
| 98 }; | 98 }; |
| 99 | 99 |
| 100 } // namespace gfx | 100 } // namespace gfx |
| 101 | 101 |
| 102 #endif // UI_GFX_ANIMATION_SLIDE_ANIMATION_H_ | 102 #endif // UI_GFX_ANIMATION_SLIDE_ANIMATION_H_ |
| OLD | NEW |