Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: views/animator.h

Issue 155170: Fix the Views GTK build. (Closed)
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | views/animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/animator.h
diff --git a/views/animator.h b/views/animator.h
index 2719fd662cc55c5d40412129c1c0a07740fcbd24..371c6b0002367c5227632ef394c569adc197dc80 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);
« no previous file with comments | « no previous file | views/animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698