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

Side by Side Diff: ui/views/examples/label_example.cc

Issue 1455333002: views: Remove a few usages of the deprecated ScopedVector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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') | no next file » | 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/geometry/vector2d.h" 8 #include "ui/gfx/geometry/vector2d.h"
9 #include "ui/views/background.h" 9 #include "ui/views/background.h"
10 #include "ui/views/border.h" 10 #include "ui/views/border.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 container->AddChildView(control_container); 202 container->AddChildView(control_container);
203 } 203 }
204 204
205 Combobox* LabelExample::AddCombobox(GridLayout* layout, 205 Combobox* LabelExample::AddCombobox(GridLayout* layout,
206 const char* name, 206 const char* name,
207 const char** strings, 207 const char** strings,
208 int count) { 208 int count) {
209 layout->StartRow(0, 0); 209 layout->StartRow(0, 0);
210 layout->AddView(new Label(base::ASCIIToUTF16(name))); 210 layout->AddView(new Label(base::ASCIIToUTF16(name)));
211 ExampleComboboxModel* model = new ExampleComboboxModel(strings, count); 211 ExampleComboboxModel* model = new ExampleComboboxModel(strings, count);
212 example_combobox_models_.push_back(model); 212 example_combobox_models_.push_back(make_scoped_ptr(model));
213 Combobox* combobox = new Combobox(model); 213 Combobox* combobox = new Combobox(model);
214 combobox->SetSelectedIndex(0); 214 combobox->SetSelectedIndex(0);
215 combobox->set_listener(this); 215 combobox->set_listener(this);
216 layout->AddView(combobox); 216 layout->AddView(combobox);
217 return combobox; 217 return combobox;
218 } 218 }
219 219
220 } // namespace examples 220 } // namespace examples
221 } // namespace views 221 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/label_example.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698