diff options
-rw-r--r-- | views/animator.cc | 6 | ||||
-rw-r--r-- | views/animator.h | 7 | ||||
-rw-r--r-- | views/widget/widget.h | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/views/animator.cc b/views/animator.cc index 2b2a7db..177b0e1 100644 --- a/views/animator.cc +++ b/views/animator.cc @@ -84,6 +84,12 @@ void Animator::AnimateToBounds(const gfx::Rect& bounds, int direction) { animation_->Show(); } +void Animator::AnimateToBounds(int x, int y, int width, int height, + int direction) { + AnimateToBounds(gfx::Rect(x, y, std::max(0, width), std::max(0, height)), + direction); +} + //////////////////////////////////////////////////////////////////////////////// // Animator, AnimationDelegate: diff --git a/views/animator.h b/views/animator.h index 2719fd6..371c6b0 100644 --- a/views/animator.h +++ b/views/animator.h @@ -5,8 +5,6 @@ #ifndef VIEWS_ANIMATOR_H_ #define VIEWS_ANIMATOR_H_ -#include <xutility> - #include "app/animation.h" #include "base/gfx/rect.h" #include "base/ref_counted.h" @@ -65,10 +63,7 @@ class Animator : public AnimationDelegate { // combination of the above flags indicating what aspects of the bounds should // be animated. void AnimateToBounds(const gfx::Rect& bounds, int direction); - void AnimateToBounds(int x, int y, int width, int height, int direction) { - AnimateToBounds(gfx::Rect(x, y, std::max(0, width), std::max(0, height)), - direction); - } + void AnimateToBounds(int x, int y, int width, int height, int direction); // Overridden from AnimationDelegate: virtual void AnimationEnded(const Animation* animation); diff --git a/views/widget/widget.h b/views/widget/widget.h index 0566b0b..f7170da 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -11,6 +11,7 @@ class ThemeProvider; namespace gfx { class Path; +class Point; class Rect; } |