| Index: ui/views/controls/tree/tree_view.h
|
| diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h
|
| index 27a51855aa40a879c9e4e14f9df66ea09e307271..2dc764e7f5688216ff6944f650fcb66feae0de1a 100644
|
| --- a/ui/views/controls/tree/tree_view.h
|
| +++ b/ui/views/controls/tree/tree_view.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
|
| #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/base/models/tree_node_model.h"
|
| #include "ui/gfx/font_list.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -386,7 +386,7 @@ class VIEWS_EXPORT TreeView : public ui::TreeModelObserver,
|
| // control, icon and offsets.
|
| int text_offset_;
|
|
|
| - scoped_ptr<PrefixSelector> selector_;
|
| + std::unique_ptr<PrefixSelector> selector_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TreeView);
|
| };
|
|
|