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

Side by Side Diff: views/examples/examples_main.cc

Issue 7846010: Fixed crash when a SinglesplitView gets embdedded inside SingleSplitView (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Examples order changed Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « views/examples/double_split_view_example.cc ('k') | views/views.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/examples/examples_main.h" 5 #include "views/examples/examples_main.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/icu_util.h" 9 #include "base/i18n/icu_util.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/base/ui_base_paths.h" 13 #include "ui/base/ui_base_paths.h"
14 #include "views/controls/button/text_button.h" 14 #include "views/controls/button/text_button.h"
15 #include "views/controls/label.h" 15 #include "views/controls/label.h"
16 #include "views/controls/tabbed_pane/tabbed_pane.h" 16 #include "views/controls/tabbed_pane/tabbed_pane.h"
17 #include "views/examples/button_example.h" 17 #include "views/examples/button_example.h"
18 #include "views/examples/combobox_example.h" 18 #include "views/examples/combobox_example.h"
19 #include "views/examples/double_split_view_example.h"
19 #include "views/examples/link_example.h" 20 #include "views/examples/link_example.h"
20 #include "views/examples/menu_example.h" 21 #include "views/examples/menu_example.h"
21 #include "views/examples/message_box_example.h" 22 #include "views/examples/message_box_example.h"
22 #include "views/examples/native_theme_button_example.h" 23 #include "views/examples/native_theme_button_example.h"
23 #include "views/examples/native_theme_checkbox_example.h" 24 #include "views/examples/native_theme_checkbox_example.h"
24 #include "views/examples/native_widget_views_example.h" 25 #include "views/examples/native_widget_views_example.h"
25 #include "views/examples/radio_button_example.h" 26 #include "views/examples/radio_button_example.h"
26 #include "views/examples/scroll_view_example.h" 27 #include "views/examples/scroll_view_example.h"
27 #include "views/examples/single_split_view_example.h" 28 #include "views/examples/single_split_view_example.h"
28 #include "views/examples/tabbed_pane_example.h" 29 #include "views/examples/tabbed_pane_example.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 144
144 RadioButtonExample radio_button_example(this); 145 RadioButtonExample radio_button_example(this);
145 AddExample(&radio_button_example); 146 AddExample(&radio_button_example);
146 147
147 ScrollViewExample scroll_view_example(this); 148 ScrollViewExample scroll_view_example(this);
148 AddExample(&scroll_view_example); 149 AddExample(&scroll_view_example);
149 150
150 SingleSplitViewExample single_split_view_example(this); 151 SingleSplitViewExample single_split_view_example(this);
151 AddExample(&single_split_view_example); 152 AddExample(&single_split_view_example);
152 153
154 DoubleSplitViewExample double_split_view_example(this);
155 AddExample(&double_split_view_example);
156
153 #if defined(OS_WIN) 157 #if defined(OS_WIN)
154 TableExample table_example(this); 158 TableExample table_example(this);
155 AddExample(&table_example); 159 AddExample(&table_example);
156 #endif 160 #endif
157 161
158 Table2Example table2_example(this); 162 Table2Example table2_example(this);
159 AddExample(&table2_example); 163 AddExample(&table2_example);
160 164
161 WidgetExample widget_example(this); 165 WidgetExample widget_example(this);
162 AddExample(&widget_example); 166 AddExample(&widget_example);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 CommandLine::ForCurrentProcess()->HasSwitch("use-pure-views")); 198 CommandLine::ForCurrentProcess()->HasSwitch("use-pure-views"));
195 199
196 examples::ExamplesMain main; 200 examples::ExamplesMain main;
197 main.Run(); 201 main.Run();
198 202
199 #if defined(OS_WIN) 203 #if defined(OS_WIN)
200 OleUninitialize(); 204 OleUninitialize();
201 #endif 205 #endif
202 return 0; 206 return 0;
203 } 207 }
OLDNEW
« no previous file with comments | « views/examples/double_split_view_example.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698