diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 21:57:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 21:57:39 +0000 |
| commit | bfacb01f726b0f3ba4b1d9c3b9fdac0390de9b30 (patch) | |
| tree | 314acc27f41eb889a8e6ecb30134a39dc8ae73e0 /views/animator.h | |
| parent | 5c9cc1ac8a29678fe75d4131a2679a9a306fbe7f (diff) | |
| download | chromium_src-bfacb01f726b0f3ba4b1d9c3b9fdac0390de9b30.zip chromium_src-bfacb01f726b0f3ba4b1d9c3b9fdac0390de9b30.tar.gz chromium_src-bfacb01f726b0f3ba4b1d9c3b9fdac0390de9b30.tar.bz2 | |
Fix the Views GTK build.
I mvoed the implementation of the previously-inline amimate function to the .cc file so we don't have to depend on STL includes in the header.
Review URL: http://codereview.chromium.org/155170
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/animator.h')
| -rw-r--r-- | views/animator.h | 7 |
1 files changed, 1 insertions, 6 deletions
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); |