summaryrefslogtreecommitdiffstats
path: root/views/examples/examples_main.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 00:26:44 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 00:26:44 +0000
commitd0545b7f65cfee49e1bdfc10d256886c1fd89818 (patch)
tree65b8d32b4937e379fff7f522937095bbdf9f3654 /views/examples/examples_main.cc
parentcdcb3bd006d0823d45187f2c7fe3c3adc0ebb031 (diff)
downloadchromium_src-d0545b7f65cfee49e1bdfc10d256886c1fd89818.zip
chromium_src-d0545b7f65cfee49e1bdfc10d256886c1fd89818.tar.gz
chromium_src-d0545b7f65cfee49e1bdfc10d256886c1fd89818.tar.bz2
Refactoring of the TableView so it uses NativeViewControl.
At this point it does not support grouping or sorting. Mostly refactoring things from TableView to TableView2 and NativeTableWin. BUG=None TEST=Unit-tests and view examples for now. R=sky Review URL: http://codereview.chromium.org/387021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/examples/examples_main.cc')
-rw-r--r--views/examples/examples_main.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index d061871..4750c89 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -17,6 +17,8 @@
#include "views/examples/radio_button_example.h"
#include "views/examples/scroll_view_example.h"
#include "views/examples/tabbed_pane_example.h"
+#include "views/examples/table_example.h"
+#include "views/examples/table2_example.h"
#include "views/examples/textfield_example.h"
#include "views/focus/accelerator_handler.h"
#include "views/grid_layout.h"
@@ -28,6 +30,10 @@ views::View* ExamplesMain::GetContentsView() {
return contents_;
}
+void ExamplesMain::WindowClosing() {
+ MessageLoopForUI::current()->Quit();
+}
+
void ExamplesMain::SetStatus(const std::wstring& status) {
status_label_->SetText(status);
}
@@ -99,6 +105,14 @@ void ExamplesMain::Run() {
tabbed_pane->AddTab(scroll_view_example.GetExampleTitle(),
scroll_view_example.GetExampleView());
+ examples::TableExample table_example(this);
+ tabbed_pane->AddTab(table_example.GetExampleTitle(),
+ table_example.GetExampleView());
+
+ examples::Table2Example table2_example(this);
+ tabbed_pane->AddTab(table2_example.GetExampleTitle(),
+ table2_example.GetExampleView());
+
window->Show();
views::AcceleratorHandler accelerator_handler;
MessageLoopForUI::current()->Run(&accelerator_handler);