summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 08:50:21 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 08:50:21 +0000
commit545188d3af75b86d413b701e7447264733e8dc30 (patch)
tree012701dd6c5913da6dadf214cf814b919f2a76c4
parent8c26f6312e7ed68e09e62ff5e61530c0caf43f39 (diff)
downloadchromium_src-545188d3af75b86d413b701e7447264733e8dc30.zip
chromium_src-545188d3af75b86d413b701e7447264733e8dc30.tar.gz
chromium_src-545188d3af75b86d413b701e7447264733e8dc30.tar.bz2
Fix the build of view_examples for Linux.
TableView and TableView2 are not yet ported to Linux. #ifdef out the related code for Linux. BUG=none TEST=manually built and ran view_examples on Linux Original patch by satorux@chromium.org via: http://codereview.chromium.org/384117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31894 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--views/examples/examples_main.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index 4750c89..9aa2adf 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -17,8 +17,11 @@
#include "views/examples/radio_button_example.h"
#include "views/examples/scroll_view_example.h"
#include "views/examples/tabbed_pane_example.h"
+#if defined(OS_WIN)
+// TableView and TableView2 are not yet ported to Linux.
#include "views/examples/table_example.h"
#include "views/examples/table2_example.h"
+#endif
#include "views/examples/textfield_example.h"
#include "views/focus/accelerator_handler.h"
#include "views/grid_layout.h"
@@ -105,6 +108,8 @@ void ExamplesMain::Run() {
tabbed_pane->AddTab(scroll_view_example.GetExampleTitle(),
scroll_view_example.GetExampleView());
+#if defined(OS_WIN)
+ // TableView and TableView2 are not yet ported to Linux.
examples::TableExample table_example(this);
tabbed_pane->AddTab(table_example.GetExampleTitle(),
table_example.GetExampleView());
@@ -112,6 +117,7 @@ void ExamplesMain::Run() {
examples::Table2Example table2_example(this);
tabbed_pane->AddTab(table2_example.GetExampleTitle(),
table2_example.GetExampleView());
+#endif
window->Show();
views::AcceleratorHandler accelerator_handler;