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

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

Issue 2836313002: BoxLayout now suports per-view margins. (Closed)
Patch Set: Merged with master. Removed cached orientation_ from ViewWrapper. Created 3 years, 6 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/box_layout_example.cc ('k') | ui/views/layout/box_layout.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 <iterator> 8 #include <iterator>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/models/combobox_model.h" 17 #include "ui/base/models/combobox_model.h"
18 #include "ui/base/ui_base_paths.h" 18 #include "ui/base/ui_base_paths.h"
19 #include "ui/views/background.h" 19 #include "ui/views/background.h"
20 #include "ui/views/controls/combobox/combobox.h" 20 #include "ui/views/controls/combobox/combobox.h"
21 #include "ui/views/controls/label.h" 21 #include "ui/views/controls/label.h"
22 #include "ui/views/examples/box_layout_example.h"
22 #include "ui/views/examples/bubble_example.h" 23 #include "ui/views/examples/bubble_example.h"
23 #include "ui/views/examples/button_example.h" 24 #include "ui/views/examples/button_example.h"
24 #include "ui/views/examples/button_sticker_sheet.h" 25 #include "ui/views/examples/button_sticker_sheet.h"
25 #include "ui/views/examples/checkbox_example.h" 26 #include "ui/views/examples/checkbox_example.h"
26 #include "ui/views/examples/combobox_example.h" 27 #include "ui/views/examples/combobox_example.h"
27 #include "ui/views/examples/dialog_example.h" 28 #include "ui/views/examples/dialog_example.h"
28 #include "ui/views/examples/label_example.h" 29 #include "ui/views/examples/label_example.h"
29 #include "ui/views/examples/link_example.h" 30 #include "ui/views/examples/link_example.h"
30 #include "ui/views/examples/menu_example.h" 31 #include "ui/views/examples/menu_example.h"
31 #include "ui/views/examples/message_box_example.h" 32 #include "ui/views/examples/message_box_example.h"
(...skipping 19 matching lines...) Expand all
51 namespace views { 52 namespace views {
52 namespace examples { 53 namespace examples {
53 54
54 using ExampleVector = std::vector<std::unique_ptr<ExampleBase>>; 55 using ExampleVector = std::vector<std::unique_ptr<ExampleBase>>;
55 56
56 namespace { 57 namespace {
57 58
58 // Creates the default set of examples. 59 // Creates the default set of examples.
59 ExampleVector CreateExamples() { 60 ExampleVector CreateExamples() {
60 ExampleVector examples; 61 ExampleVector examples;
62 examples.push_back(base::MakeUnique<BoxLayoutExample>());
61 examples.push_back(base::MakeUnique<BubbleExample>()); 63 examples.push_back(base::MakeUnique<BubbleExample>());
62 examples.push_back(base::MakeUnique<ButtonExample>()); 64 examples.push_back(base::MakeUnique<ButtonExample>());
63 examples.push_back(base::MakeUnique<ButtonStickerSheet>()); 65 examples.push_back(base::MakeUnique<ButtonStickerSheet>());
64 examples.push_back(base::MakeUnique<CheckboxExample>()); 66 examples.push_back(base::MakeUnique<CheckboxExample>());
65 examples.push_back(base::MakeUnique<ComboboxExample>()); 67 examples.push_back(base::MakeUnique<ComboboxExample>());
66 examples.push_back(base::MakeUnique<DialogExample>()); 68 examples.push_back(base::MakeUnique<DialogExample>());
67 examples.push_back(base::MakeUnique<LabelExample>()); 69 examples.push_back(base::MakeUnique<LabelExample>());
68 examples.push_back(base::MakeUnique<LinkExample>()); 70 examples.push_back(base::MakeUnique<LinkExample>());
69 examples.push_back(base::MakeUnique<MenuExample>()); 71 examples.push_back(base::MakeUnique<MenuExample>());
70 examples.push_back(base::MakeUnique<MessageBoxExample>()); 72 examples.push_back(base::MakeUnique<MessageBoxExample>());
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 widget->Show(); 237 widget->Show();
236 } 238 }
237 } 239 }
238 240
239 void LogStatus(const std::string& string) { 241 void LogStatus(const std::string& string) {
240 ExamplesWindowContents::instance()->SetStatus(string); 242 ExamplesWindowContents::instance()->SetStatus(string);
241 } 243 }
242 244
243 } // namespace examples 245 } // namespace examples
244 } // namespace views 246 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/box_layout_example.cc ('k') | ui/views/layout/box_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698