1 files changed, 8 insertions, 11 deletions
diff --git a/views/examples/table_example.h b/views/examples/table_example.h
index a9e6ebc..081e0de 100644
--- a/views/examples/table_example.h
+++ b/views/examples/table_example.h
@@ -15,17 +15,14 @@
 #include "views/controls/table/table_view_observer.h"
 #include "views/examples/example_base.h"
 #include "views/layout/fill_layout.h"
-
-using ui::TableModel;
-using ui::TableModelObserver; // TODO(beng): remove these
+#include "views/layout/grid_layout.h"
 
 namespace examples {
 
-class TableExample
-    : public ExampleBase,
-      public TableModel,
-      public views::ButtonListener,
-      public views::TableViewObserver {
+class TableExample : public ExampleBase,
+                     public ui::TableModel,
+                     public views::ButtonListener,
+                     public views::TableViewObserver {
  public:
   explicit TableExample(ExamplesMain* main) : ExampleBase(main) {
   }
@@ -95,7 +92,7 @@ class TableExample
     layout->AddView(column4_visible_checkbox_);
   }
 
-  // TableModel implementation:
+  // Overridden from ui::TableModel:
   virtual int RowCount() {
     return 10;
   }
@@ -115,10 +112,10 @@ class TableExample
     return row % 2 ? icon1 : icon2;
   }
 
-  virtual void SetObserver(TableModelObserver* observer) {
+  virtual void SetObserver(ui::TableModelObserver* observer) {
   }
 
-  // TableViewObserver implementation:
+  // Overridden from views::TableViewObserver:
   virtual void OnSelectionChanged() {
     PrintStatus(L"Selection changed");
   }