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

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

Issue 2230913003: Experimental alignment layout manager using a property on the views Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed AlignAttribute and associated types to FillAttribute Created 4 years, 2 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/anchor_example.cc ('k') | ui/views/examples/fill_example.h » ('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/examples_window.h" 5 #include "ui/views/examples/examples_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/models/combobox_model.h" 15 #include "ui/base/models/combobox_model.h"
16 #include "ui/base/ui_base_paths.h" 16 #include "ui/base/ui_base_paths.h"
17 #include "ui/views/background.h" 17 #include "ui/views/background.h"
18 #include "ui/views/controls/combobox/combobox.h" 18 #include "ui/views/controls/combobox/combobox.h"
19 #include "ui/views/controls/label.h" 19 #include "ui/views/controls/label.h"
20 #include "ui/views/examples/anchor_example.h"
20 #include "ui/views/examples/bubble_example.h" 21 #include "ui/views/examples/bubble_example.h"
21 #include "ui/views/examples/button_example.h" 22 #include "ui/views/examples/button_example.h"
22 #include "ui/views/examples/button_sticker_sheet.h" 23 #include "ui/views/examples/button_sticker_sheet.h"
23 #include "ui/views/examples/checkbox_example.h" 24 #include "ui/views/examples/checkbox_example.h"
24 #include "ui/views/examples/combobox_example.h" 25 #include "ui/views/examples/combobox_example.h"
26 #include "ui/views/examples/fill_example.h"
25 #include "ui/views/examples/label_example.h" 27 #include "ui/views/examples/label_example.h"
26 #include "ui/views/examples/link_example.h" 28 #include "ui/views/examples/link_example.h"
27 #include "ui/views/examples/menu_example.h" 29 #include "ui/views/examples/menu_example.h"
28 #include "ui/views/examples/message_box_example.h" 30 #include "ui/views/examples/message_box_example.h"
29 #include "ui/views/examples/multiline_example.h" 31 #include "ui/views/examples/multiline_example.h"
30 #include "ui/views/examples/progress_bar_example.h" 32 #include "ui/views/examples/progress_bar_example.h"
31 #include "ui/views/examples/radio_button_example.h" 33 #include "ui/views/examples/radio_button_example.h"
32 #include "ui/views/examples/scroll_view_example.h" 34 #include "ui/views/examples/scroll_view_example.h"
33 #include "ui/views/examples/slider_example.h" 35 #include "ui/views/examples/slider_example.h"
34 #include "ui/views/examples/tabbed_pane_example.h" 36 #include "ui/views/examples/tabbed_pane_example.h"
(...skipping 13 matching lines...) Expand all
48 namespace views { 50 namespace views {
49 namespace examples { 51 namespace examples {
50 52
51 typedef std::unique_ptr<ScopedVector<ExampleBase>> ScopedExamples; 53 typedef std::unique_ptr<ScopedVector<ExampleBase>> ScopedExamples;
52 54
53 namespace { 55 namespace {
54 56
55 // Creates the default set of examples. Caller owns the result. 57 // Creates the default set of examples. Caller owns the result.
56 ScopedExamples CreateExamples() { 58 ScopedExamples CreateExamples() {
57 ScopedExamples examples(new ScopedVector<ExampleBase>); 59 ScopedExamples examples(new ScopedVector<ExampleBase>);
60 examples->push_back(new AnchorExample);
58 examples->push_back(new BubbleExample); 61 examples->push_back(new BubbleExample);
59 examples->push_back(new ButtonExample); 62 examples->push_back(new ButtonExample);
60 examples->push_back(new ButtonStickerSheet); 63 examples->push_back(new ButtonStickerSheet);
61 examples->push_back(new CheckboxExample); 64 examples->push_back(new CheckboxExample);
62 examples->push_back(new ComboboxExample); 65 examples->push_back(new ComboboxExample);
66 examples->push_back(new FillExample);
63 examples->push_back(new LabelExample); 67 examples->push_back(new LabelExample);
64 examples->push_back(new LinkExample); 68 examples->push_back(new LinkExample);
65 examples->push_back(new MenuExample); 69 examples->push_back(new MenuExample);
66 examples->push_back(new MessageBoxExample); 70 examples->push_back(new MessageBoxExample);
67 examples->push_back(new MultilineExample); 71 examples->push_back(new MultilineExample);
68 examples->push_back(new ProgressBarExample); 72 examples->push_back(new ProgressBarExample);
69 examples->push_back(new RadioButtonExample); 73 examples->push_back(new RadioButtonExample);
70 examples->push_back(new ScrollViewExample); 74 examples->push_back(new ScrollViewExample);
71 examples->push_back(new SliderExample); 75 examples->push_back(new SliderExample);
72 examples->push_back(new TabbedPaneExample); 76 examples->push_back(new TabbedPaneExample);
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 widget->Show(); 235 widget->Show();
232 } 236 }
233 } 237 }
234 238
235 void LogStatus(const std::string& string) { 239 void LogStatus(const std::string& string) {
236 ExamplesWindowContents::instance()->SetStatus(string); 240 ExamplesWindowContents::instance()->SetStatus(string);
237 } 241 }
238 242
239 } // namespace examples 243 } // namespace examples
240 } // namespace views 244 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/anchor_example.cc ('k') | ui/views/examples/fill_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698