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

Side by Side Diff: ui/views/examples/label_example.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 unified diff | Download patch
« no previous file with comments | « ui/views/examples/examples_window_with_content.cc ('k') | ui/views/examples/label_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 #ifndef UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/controls/button/button.h" 9 #include "ui/views/controls/button/button.h"
10 #include "ui/views/controls/combobox/combobox_listener.h" 10 #include "ui/views/controls/combobox/combobox_listener.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 // Creates and adds a combobox to the layout. 49 // Creates and adds a combobox to the layout.
50 Combobox* AddCombobox(GridLayout* layout, 50 Combobox* AddCombobox(GridLayout* layout,
51 const char* name, 51 const char* name,
52 const char** strings, 52 const char** strings,
53 int count); 53 int count);
54 54
55 Textfield* textfield_; 55 Textfield* textfield_;
56 Combobox* alignment_; 56 Combobox* alignment_;
57 Combobox* elide_behavior_; 57 Combobox* elide_behavior_;
58 std::vector<scoped_ptr<ExampleComboboxModel>> example_combobox_models_; 58 std::vector<std::unique_ptr<ExampleComboboxModel>> example_combobox_models_;
59 Checkbox* multiline_; 59 Checkbox* multiline_;
60 Checkbox* shadows_; 60 Checkbox* shadows_;
61 Label* custom_label_; 61 Label* custom_label_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(LabelExample); 63 DISALLOW_COPY_AND_ASSIGN(LabelExample);
64 }; 64 };
65 65
66 } // namespace examples 66 } // namespace examples
67 } // namespace views 67 } // namespace views
68 68
69 #endif // UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_ 69 #endif // UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/examples/examples_window_with_content.cc ('k') | ui/views/examples/label_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698