summaryrefslogtreecommitdiffstats
path: root/ui/base/animation
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 04:51:07 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 04:51:07 +0000
commit507bad5377a236f93f8ec190ca4354dd3cb47b39 (patch)
tree690a510a35e4b1d41eba5948c2d9e78044b6a7fb /ui/base/animation
parent843ccb24f7b092580c48cf659865def0758ed976 (diff)
downloadchromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.zip
chromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.tar.gz
chromium_src-507bad5377a236f93f8ec190ca4354dd3cb47b39.tar.bz2
Rename UI_API to UI_EXPORT.
R=rvargas@chromium.org Review URL: http://codereview.chromium.org/7569005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/animation')
-rw-r--r--ui/base/animation/animation.h2
-rw-r--r--ui/base/animation/animation_container.h4
-rw-r--r--ui/base/animation/animation_container_element.h4
-rw-r--r--ui/base/animation/animation_container_observer.h4
-rw-r--r--ui/base/animation/animation_delegate.h4
-rw-r--r--ui/base/animation/linear_animation.h2
-rw-r--r--ui/base/animation/multi_animation.h2
-rw-r--r--ui/base/animation/slide_animation.h2
-rw-r--r--ui/base/animation/throb_animation.h2
-rw-r--r--ui/base/animation/tween.h4
10 files changed, 15 insertions, 15 deletions
diff --git a/ui/base/animation/animation.h b/ui/base/animation/animation.h
index 8de0f0c6a..3b8288d 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 UI_API Animation : public AnimationContainerElement {
+class UI_EXPORT 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 04c3f0d..bf4db5d 100644
--- a/ui/base/animation/animation_container.h
+++ b/ui/base/animation/animation_container.h
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/time.h"
#include "base/timer.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace ui {
@@ -26,7 +26,7 @@ class AnimationContainerObserver;
//
// AnimationContainer is ref counted. Each Animation contained within the
// AnimationContainer own it.
-class UI_API AnimationContainer
+class UI_EXPORT 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 f49eb29..169347f35 100644
--- a/ui/base/animation/animation_container_element.h
+++ b/ui/base/animation/animation_container_element.h
@@ -7,13 +7,13 @@
#pragma once
#include "base/time.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace ui {
// Interface for the elements the AnimationContainer contains. This is
// implemented by Animation.
-class UI_API AnimationContainerElement {
+class UI_EXPORT AnimationContainerElement {
public:
// Sets the start of the animation. This is invoked from
// AnimationContainer::Start.
diff --git a/ui/base/animation/animation_container_observer.h b/ui/base/animation/animation_container_observer.h
index 17fee92..5df7650 100644
--- a/ui/base/animation/animation_container_observer.h
+++ b/ui/base/animation/animation_container_observer.h
@@ -6,7 +6,7 @@
#define UI_BASE_ANIMATION_ANIMATION_CONTAINER_OBSERVER_H_
#pragma once
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace ui {
@@ -14,7 +14,7 @@ class AnimationContainer;
// The observer is notified after every update of the animations managed by
// the container.
-class UI_API AnimationContainerObserver {
+class UI_EXPORT AnimationContainerObserver {
public:
// Invoked on every tick of the timer managed by the container and after
// all the animations have updated.
diff --git a/ui/base/animation/animation_delegate.h b/ui/base/animation/animation_delegate.h
index 8c65d8f..43e5062 100644
--- a/ui/base/animation/animation_delegate.h
+++ b/ui/base/animation/animation_delegate.h
@@ -6,7 +6,7 @@
#define UI_BASE_ANIMATION_ANIMATION_DELEGATE_H_
#pragma once
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace ui {
@@ -16,7 +16,7 @@ class Animation;
//
// Implement this interface when you want to receive notifications about the
// state of an animation.
-class UI_API AnimationDelegate {
+class UI_EXPORT AnimationDelegate {
public:
// Called when an animation has completed.
virtual void AnimationEnded(const Animation* animation) {}
diff --git a/ui/base/animation/linear_animation.h b/ui/base/animation/linear_animation.h
index 7e09efb..a327c0a 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 UI_API LinearAnimation : public Animation {
+class UI_EXPORT 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 fcd18b5..ff4cd5d 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 UI_API MultiAnimation : public Animation {
+class UI_EXPORT 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 a715f75..7542845 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 UI_API SlideAnimation : public LinearAnimation {
+class UI_EXPORT 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 81b9ab4..ff6faa09 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 UI_API ThrobAnimation : public SlideAnimation {
+class UI_EXPORT 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 9681bed..6bde5dd 100644
--- a/ui/base/animation/tween.h
+++ b/ui/base/animation/tween.h
@@ -7,7 +7,7 @@
#pragma once
#include "base/basictypes.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace gfx {
class Rect;
@@ -15,7 +15,7 @@ class Rect;
namespace ui {
-class UI_API Tween {
+class UI_EXPORT Tween {
public:
enum Type {
LINEAR, // Linear.