| Index: ui/base/ime/candidate_window.h
|
| diff --git a/ui/base/ime/candidate_window.h b/ui/base/ime/candidate_window.h
|
| index ca2cc2be17dcdeda3bea88144d1fbd3ccef1040e..f27bfe29b702e8c48df4ed8b52e3eb0047b8619f 100644
|
| --- a/ui/base/ime/candidate_window.h
|
| +++ b/ui/base/ime/candidate_window.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/base/ime/infolist_entry.h"
|
| #include "ui/base/ime/ui_base_ime_export.h"
|
|
|
| @@ -124,7 +124,7 @@ class UI_BASE_IME_EXPORT CandidateWindow {
|
| }
|
|
|
| private:
|
| - scoped_ptr<CandidateWindowProperty> property_;
|
| + std::unique_ptr<CandidateWindowProperty> property_;
|
| std::vector<Entry> candidates_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CandidateWindow);
|
|
|