Index: ui/gfx/interpolated_transform.h |
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h |
index 139e77b3de13c4943095cbd627d8ce18fbabb118..a22a0e774e51d57bb09f46d2b00f56f121daa3dc 100644 |
--- a/ui/gfx/interpolated_transform.h |
+++ b/ui/gfx/interpolated_transform.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_ |
#define UI_GFX_INTERPOLATED_TRANSFORM_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/gfx/geometry/point3_f.h" |
#include "ui/gfx/geometry/vector3d_f.h" |
@@ -71,7 +72,7 @@ class GFX_EXPORT InterpolatedTransform { |
// function of t. If, without a child, we are f(t), and our child is |
// g(t), then with a child we become f'(t) = f(t) * g(t). Using a child |
// transform, we can chain collections of transforms together. |
- scoped_ptr<InterpolatedTransform> child_; |
+ std::unique_ptr<InterpolatedTransform> child_; |
bool reversed_; |
@@ -238,7 +239,7 @@ class GFX_EXPORT InterpolatedTransformAboutPivot |
private: |
void Init(const gfx::Point& pivot, InterpolatedTransform* transform); |
- scoped_ptr<InterpolatedTransform> transform_; |
+ std::unique_ptr<InterpolatedTransform> transform_; |
DISALLOW_COPY_AND_ASSIGN(InterpolatedTransformAboutPivot); |
}; |