diff options
Diffstat (limited to 'ui/base/animation')
-rw-r--r-- | ui/base/animation/animation.h | 2 | ||||
-rw-r--r-- | ui/base/animation/animation_container.h | 4 | ||||
-rw-r--r-- | ui/base/animation/animation_container_element.h | 3 | ||||
-rw-r--r-- | ui/base/animation/linear_animation.h | 2 | ||||
-rw-r--r-- | ui/base/animation/multi_animation.h | 2 | ||||
-rw-r--r-- | ui/base/animation/slide_animation.h | 2 | ||||
-rw-r--r-- | ui/base/animation/throb_animation.h | 2 | ||||
-rw-r--r-- | ui/base/animation/tween.h | 3 |
8 files changed, 12 insertions, 8 deletions
diff --git a/ui/base/animation/animation.h b/ui/base/animation/animation.h index 272f093..8de0f0c6a 100644 --- a/ui/base/animation/animation.h +++ b/ui/base/animation/animation.h @@ -25,7 +25,7 @@ class AnimationDelegate; // // To subclass override Step, which is invoked as the animation progresses and // GetCurrentValue() to return the value appropriate to the animation. -class Animation : public AnimationContainerElement { +class UI_API Animation : public AnimationContainerElement { public: explicit Animation(base::TimeDelta timer_interval); virtual ~Animation(); diff --git a/ui/base/animation/animation_container.h b/ui/base/animation/animation_container.h index 3e7a458..04c3f0d 100644 --- a/ui/base/animation/animation_container.h +++ b/ui/base/animation/animation_container.h @@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/time.h" #include "base/timer.h" +#include "ui/ui_api.h" namespace ui { @@ -25,7 +26,8 @@ class AnimationContainerObserver; // // AnimationContainer is ref counted. Each Animation contained within the // AnimationContainer own it. -class AnimationContainer : public base::RefCounted<AnimationContainer> { +class UI_API AnimationContainer + : public base::RefCounted<AnimationContainer> { public: AnimationContainer(); diff --git a/ui/base/animation/animation_container_element.h b/ui/base/animation/animation_container_element.h index 8ac63a5..f49eb29 100644 --- a/ui/base/animation/animation_container_element.h +++ b/ui/base/animation/animation_container_element.h @@ -7,12 +7,13 @@ #pragma once #include "base/time.h" +#include "ui/ui_api.h" namespace ui { // Interface for the elements the AnimationContainer contains. This is // implemented by Animation. -class AnimationContainerElement { +class UI_API AnimationContainerElement { public: // Sets the start of the animation. This is invoked from // AnimationContainer::Start. diff --git a/ui/base/animation/linear_animation.h b/ui/base/animation/linear_animation.h index 38205ea..7e09efb 100644 --- a/ui/base/animation/linear_animation.h +++ b/ui/base/animation/linear_animation.h @@ -15,7 +15,7 @@ class AnimationDelegate; // Linear time bounded animation. As the animation progresses AnimateToState is // invoked. -class LinearAnimation : public Animation { +class UI_API LinearAnimation : public Animation { public: // Initializes everything except the duration. // diff --git a/ui/base/animation/multi_animation.h b/ui/base/animation/multi_animation.h index fbacde3..fcd18b5 100644 --- a/ui/base/animation/multi_animation.h +++ b/ui/base/animation/multi_animation.h @@ -17,7 +17,7 @@ namespace ui { // To create a MultiAnimation pass in the parts, invoke Start() and the delegate // is notified as the animation progresses. By default MultiAnimation runs until // Stop is invoked, see |set_continuous()| for details. -class MultiAnimation : public Animation { +class UI_API MultiAnimation : public Animation { public: // Defines part of the animation. Each part consists of the following: // diff --git a/ui/base/animation/slide_animation.h b/ui/base/animation/slide_animation.h index 8f5e67c..a715f75 100644 --- a/ui/base/animation/slide_animation.h +++ b/ui/base/animation/slide_animation.h @@ -45,7 +45,7 @@ namespace ui { // private: // scoped_ptr<SlideAnimation> animation_; // } -class SlideAnimation : public LinearAnimation { +class UI_API SlideAnimation : public LinearAnimation { public: explicit SlideAnimation(AnimationDelegate* target); virtual ~SlideAnimation(); diff --git a/ui/base/animation/throb_animation.h b/ui/base/animation/throb_animation.h index 21dc03b..81b9ab4 100644 --- a/ui/base/animation/throb_animation.h +++ b/ui/base/animation/throb_animation.h @@ -17,7 +17,7 @@ namespace ui { // // A ThrobAnimation has two durations: the duration used when behavior like // a SlideAnimation, and the duration used when throbbing. -class ThrobAnimation : public SlideAnimation { +class UI_API ThrobAnimation : public SlideAnimation { public: explicit ThrobAnimation(AnimationDelegate* target); virtual ~ThrobAnimation() {} diff --git a/ui/base/animation/tween.h b/ui/base/animation/tween.h index 873281f..9681bed 100644 --- a/ui/base/animation/tween.h +++ b/ui/base/animation/tween.h @@ -7,6 +7,7 @@ #pragma once #include "base/basictypes.h" +#include "ui/ui_api.h" namespace gfx { class Rect; @@ -14,7 +15,7 @@ class Rect; namespace ui { -class Tween { +class UI_API Tween { public: enum Type { LINEAR, // Linear. |