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

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: Sync up with trunk 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 layout->AddView(status_label_); 108 layout->AddView(status_label_);
108 109
109 // TODO(satorux): The window is getting wide. Eventually, we would have 110 // TODO(satorux): The window is getting wide. Eventually, we would have
110 // the second tabbed pane. 111 // the second tabbed pane.
111 views::Widget* window = 112 views::Widget* window =
112 views::Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 850, 300)); 113 views::Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 850, 300));
113 114
114 NativeThemeCheckboxExample native_theme_checkbox_example(this); 115 NativeThemeCheckboxExample native_theme_checkbox_example(this);
115 AddExample(&native_theme_checkbox_example); 116 AddExample(&native_theme_checkbox_example);
116 117
118 DoubleSplitViewExample double_split_view_example(this);
119 AddExample(&double_split_view_example);
tfarina 2011/09/15 13:46:31 Put this example after the SingleSplitView, after
Gajen 2011/09/15 13:57:33 Done.
120
117 NativeThemeButtonExample native_theme_button_example(this); 121 NativeThemeButtonExample native_theme_button_example(this);
118 AddExample(&native_theme_button_example); 122 AddExample(&native_theme_button_example);
119 123
120 NativeWidgetViewsExample native_widget_views_example(this); 124 NativeWidgetViewsExample native_widget_views_example(this);
121 AddExample(&native_widget_views_example); 125 AddExample(&native_widget_views_example);
122 126
123 TextfieldExample textfield_example(this); 127 TextfieldExample textfield_example(this);
124 AddExample(&textfield_example); 128 AddExample(&textfield_example);
125 129
126 ButtonExample button_example(this); 130 ButtonExample button_example(this);
(...skipping 67 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