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

Unified Diff: ui/views/examples/label_example.cc

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/views/examples/label_example.h ('k') | ui/views/examples/menu_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/label_example.cc
diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc
index 98ea080ac0883b72a4c21e9d30a095acc89e4414..6683626e376dde7e3cbf1a7852e22064f5456e94 100644
--- a/ui/views/examples/label_example.cc
+++ b/ui/views/examples/label_example.cc
@@ -5,6 +5,7 @@
#include "ui/views/examples/label_example.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/views/background.h"
@@ -210,7 +211,7 @@ Combobox* LabelExample::AddCombobox(GridLayout* layout,
layout->StartRow(0, 0);
layout->AddView(new Label(base::ASCIIToUTF16(name)));
ExampleComboboxModel* model = new ExampleComboboxModel(strings, count);
- example_combobox_models_.push_back(make_scoped_ptr(model));
+ example_combobox_models_.push_back(base::WrapUnique(model));
Combobox* combobox = new Combobox(model);
combobox->SetSelectedIndex(0);
combobox->set_listener(this);
« no previous file with comments | « ui/views/examples/label_example.h ('k') | ui/views/examples/menu_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698