summaryrefslogtreecommitdiffstats
path: root/views/examples/examples_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/examples/examples_main.cc')
-rw-r--r--views/examples/examples_main.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 5aa3279..0b8b7b1 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -16,9 +16,13 @@
#include "views/examples/message_box_example.h"
#include "views/examples/radio_button_example.h"
#include "views/examples/scroll_view_example.h"
+// Slider is not yet ported to Windows.
+#if defined(OS_LINUX)
+#include "views/examples/slider_example.h"
+#endif
#include "views/examples/tabbed_pane_example.h"
#if defined(OS_WIN)
-// TableView and TableView2 are not yet ported to Linux.
+// TableView is not yet ported to Linux.
#include "views/examples/table_example.h"
#endif
#include "views/examples/table2_example.h"
@@ -79,7 +83,7 @@ void ExamplesMain::Run() {
layout->AddView(status_label_);
views::Window* window =
- views::Window::CreateChromeWindow(NULL, gfx::Rect(0, 0, 700, 300), this);
+ views::Window::CreateChromeWindow(NULL, gfx::Rect(0, 0, 750, 300), this);
examples::TextfieldExample textfield_example(this);
tabbed_pane->AddTab(textfield_example.GetExampleTitle(),
@@ -123,6 +127,12 @@ void ExamplesMain::Run() {
tabbed_pane->AddTab(widget_example.GetExampleTitle(),
widget_example.GetExampleView());
+#if defined(OS_LINUX)
+ examples::SliderExample slider_example(this);
+ tabbed_pane->AddTab(slider_example.GetExampleTitle(),
+ slider_example.GetExampleView());
+#endif
+
window->Show();
views::AcceleratorHandler accelerator_handler;
MessageLoopForUI::current()->Run(&accelerator_handler);