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

Unified Diff: ui/base/ime/candidate_window.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/base/idle/idle_query_x11.h ('k') | ui/base/ime/candidate_window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ui/base/idle/idle_query_x11.h ('k') | ui/base/ime/candidate_window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698