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
Esse commit está contido em:
@@ -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:
|
||||
|
||||
|
||||
+1
-6
@@ -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);
|
||||
|
||||
@@ -11,6 +11,7 @@ class ThemeProvider;
|
||||
|
||||
namespace gfx {
|
||||
class Path;
|
||||
class Point;
|
||||
class Rect;
|
||||
}
|
||||
|
||||
|
||||
Referência em uma Nova Issue
Bloquear um usuário