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

Unified Diff: ui/gfx/interpolated_transform.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/gfx/image/image_util_unittest.cc ('k') | ui/gfx/interpolated_transform.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ui/gfx/image/image_util_unittest.cc ('k') | ui/gfx/interpolated_transform.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698