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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/examples/label_example.h" 5 #include "ui/views/examples/label_example.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h"
8 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
9 #include "ui/gfx/geometry/vector2d.h" 10 #include "ui/gfx/geometry/vector2d.h"
10 #include "ui/views/background.h" 11 #include "ui/views/background.h"
11 #include "ui/views/border.h" 12 #include "ui/views/border.h"
12 #include "ui/views/controls/button/checkbox.h" 13 #include "ui/views/controls/button/checkbox.h"
13 #include "ui/views/controls/combobox/combobox.h" 14 #include "ui/views/controls/combobox/combobox.h"
14 #include "ui/views/controls/label.h" 15 #include "ui/views/controls/label.h"
15 #include "ui/views/controls/textfield/textfield.h" 16 #include "ui/views/controls/textfield/textfield.h"
16 #include "ui/views/examples/example_combobox_model.h" 17 #include "ui/views/examples/example_combobox_model.h"
17 #include "ui/views/layout/box_layout.h" 18 #include "ui/views/layout/box_layout.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 container->AddChildView(control_container); 204 container->AddChildView(control_container);
204 } 205 }
205 206
206 Combobox* LabelExample::AddCombobox(GridLayout* layout, 207 Combobox* LabelExample::AddCombobox(GridLayout* layout,
207 const char* name, 208 const char* name,
208 const char** strings, 209 const char** strings,
209 int count) { 210 int count) {
210 layout->StartRow(0, 0); 211 layout->StartRow(0, 0);
211 layout->AddView(new Label(base::ASCIIToUTF16(name))); 212 layout->AddView(new Label(base::ASCIIToUTF16(name)));
212 ExampleComboboxModel* model = new ExampleComboboxModel(strings, count); 213 ExampleComboboxModel* model = new ExampleComboboxModel(strings, count);
213 example_combobox_models_.push_back(make_scoped_ptr(model)); 214 example_combobox_models_.push_back(base::WrapUnique(model));
214 Combobox* combobox = new Combobox(model); 215 Combobox* combobox = new Combobox(model);
215 combobox->SetSelectedIndex(0); 216 combobox->SetSelectedIndex(0);
216 combobox->set_listener(this); 217 combobox->set_listener(this);
217 layout->AddView(combobox); 218 layout->AddView(combobox);
218 return combobox; 219 return combobox;
219 } 220 }
220 221
221 } // namespace examples 222 } // namespace examples
222 } // namespace views 223 } // namespace views
OLDNEW
« 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