| Index: ui/gfx/render_text.h
|
| diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
|
| index 5913f4dcb68cb40b63885d37f6b788aaef8f8069..6b0c489cf502a8ac6e8cea80dd83b320f8baeb66 100644
|
| --- a/ui/gfx/render_text.h
|
| +++ b/ui/gfx/render_text.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include <algorithm>
|
| #include <cstring>
|
| +#include <memory>
|
| #include <string>
|
| #include <utility>
|
| #include <vector>
|
| @@ -17,7 +18,6 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/i18n/rtl.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "skia/ext/refptr.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| @@ -113,7 +113,7 @@ class GFX_EXPORT SkiaTextRenderer {
|
| SkPaint paint_;
|
| SkScalar underline_thickness_;
|
| SkScalar underline_position_;
|
| - scoped_ptr<DiagonalStrike> diagonal_;
|
| + std::unique_ptr<DiagonalStrike> diagonal_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SkiaTextRenderer);
|
| };
|
| @@ -210,7 +210,7 @@ class GFX_EXPORT RenderText {
|
| static RenderText* CreateInstanceForEditing();
|
|
|
| // Creates another instance of the same concrete class.
|
| - virtual scoped_ptr<RenderText> CreateInstanceOfSameType() const = 0;
|
| + virtual std::unique_ptr<RenderText> CreateInstanceOfSameType() const = 0;
|
|
|
| const base::string16& text() const { return text_; }
|
| void SetText(const base::string16& text);
|
|
|