Index: ash/rotator/window_rotation.cc |
diff --git a/ash/rotator/window_rotation.cc b/ash/rotator/window_rotation.cc |
index b64477d976154d42429f5d3b1fa0c83c5192fd80..ad023b978dfdabb03d963e5055fd06d7575ac7ad 100644 |
--- a/ash/rotator/window_rotation.cc |
+++ b/ash/rotator/window_rotation.cc |
@@ -77,20 +77,20 @@ void WindowRotation::InitTransform(ui::Layer* layer) { |
current_transform.TransformPoint(&new_pivot); |
current_transform.TransformPoint(&new_origin_); |
- scoped_ptr<ui::InterpolatedTransform> rotation( |
+ std::unique_ptr<ui::InterpolatedTransform> rotation( |
new ui::InterpolatedTransformAboutPivot( |
old_pivot, new ui::InterpolatedRotation(0, degrees_))); |
- scoped_ptr<ui::InterpolatedTransform> translation( |
+ std::unique_ptr<ui::InterpolatedTransform> translation( |
new ui::InterpolatedTranslation( |
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( |
+ std::unique_ptr<ui::InterpolatedTransform> scale_down( |
new ui::InterpolatedScale(1.0f, scale_factor, 0.0f, 0.5f)); |
- scoped_ptr<ui::InterpolatedTransform> scale_up( |
+ std::unique_ptr<ui::InterpolatedTransform> scale_up( |
new ui::InterpolatedScale(1.0f, 1.0f / scale_factor, 0.5f, 1.0f)); |
interpolated_transform_.reset( |