summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/rotator/window_rotation.cc4
-rw-r--r--ash/wm/window_animations.cc5
2 files changed, 4 insertions, 5 deletions
diff --git a/ash/rotator/window_rotation.cc b/ash/rotator/window_rotation.cc
index a82d4ac..b64477d 100644
--- a/ash/rotator/window_rotation.cc
+++ b/ash/rotator/window_rotation.cc
@@ -83,8 +83,8 @@ void WindowRotation::InitTransform(ui::Layer* layer) {
scoped_ptr<ui::InterpolatedTransform> translation(
new ui::InterpolatedTranslation(
- gfx::Point(0, 0), gfx::Point(new_pivot.x() - old_pivot.x(),
- new_pivot.y() - old_pivot.y())));
+ gfx::PointF(), gfx::PointF(new_pivot.x() - old_pivot.x(),
+ new_pivot.y() - old_pivot.y())));
float scale_factor = 0.9f;
scoped_ptr<ui::InterpolatedTransform> scale_down(
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index dbd8bf3..277f537 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -112,9 +112,8 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
scoped_ptr<ui::InterpolatedTransform> translation(
new ui::InterpolatedTranslation(
- gfx::Point(),
- gfx::Point(target_bounds.x() - bounds.x(),
- target_bounds.y() - bounds.y())));
+ gfx::PointF(), gfx::PointF(target_bounds.x() - bounds.x(),
+ target_bounds.y() - bounds.y())));
scale->SetChild(translation.release());
scale->SetReversed(show);