| Index: ui/views/controls/textfield/textfield_model.h
|
| diff --git a/ui/views/controls/textfield/textfield_model.h b/ui/views/controls/textfield/textfield_model.h
|
| index 9bdb48c834f4786cbcd4c90713b6782a217a1567..135524e289a44035be219830cdb0e1044f7febf1 100644
|
| --- a/ui/views/controls/textfield/textfield_model.h
|
| +++ b/ui/views/controls/textfield/textfield_model.h
|
| @@ -8,11 +8,11 @@
|
| #include <stddef.h>
|
|
|
| #include <list>
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "ui/base/ime/composition_text.h"
|
| #include "ui/gfx/render_text.h"
|
| @@ -268,7 +268,7 @@ class VIEWS_EXPORT TextfieldModel {
|
| Delegate* delegate_;
|
|
|
| // The stylized text, cursor, selection, and the visual layout model.
|
| - scoped_ptr<gfx::RenderText> render_text_;
|
| + std::unique_ptr<gfx::RenderText> render_text_;
|
|
|
| // The composition range.
|
| gfx::Range composition_range_;
|
|
|