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

Unified Diff: ui/views/examples/examples_window.cc

Issue 9187027: Attempt 2 at: Adds a trivial views based table implementation (only supports single (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/table/table_view_win.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_window.cc
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 835ae1f9d9fd4b5a2e7723e4fe31d5dfcb896b18..b43c51603abda99d17fac1c11ab54606ba21dd56 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -28,6 +28,7 @@
#include "ui/views/examples/scroll_view_example.h"
#include "ui/views/examples/single_split_view_example.h"
#include "ui/views/examples/tabbed_pane_example.h"
+#include "ui/views/examples/table_example.h"
#include "ui/views/examples/text_example.h"
#include "ui/views/examples/textfield_example.h"
#include "ui/views/examples/throbber_example.h"
@@ -39,11 +40,7 @@
#if !defined(USE_AURA)
#include "ui/views/examples/menu_example.h"
-#if defined(OS_WIN)
-#include "ui/views/examples/table_example.h"
#endif
-#endif
-
namespace views {
namespace examples {
@@ -111,6 +108,7 @@ class ExamplesWindowContents : public views::WidgetDelegateView {
// Adds all the individual examples to the tab strip.
void AddExamples() {
AddExample(new TreeViewExample);
+ AddExample(new TableExample);
AddExample(new BubbleExample);
AddExample(new ButtonExample);
AddExample(new ComboboxExample);
@@ -127,9 +125,6 @@ class ExamplesWindowContents : public views::WidgetDelegateView {
AddExample(new ScrollViewExample);
AddExample(new SingleSplitViewExample);
AddExample(new TabbedPaneExample);
-#if !defined(USE_AURA) && defined(OS_WIN)
- AddExample(new TableExample);
-#endif
AddExample(new TextExample);
AddExample(new TextfieldExample);
AddExample(new ThrobberExample);
« no previous file with comments | « ui/views/controls/table/table_view_win.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698