Enables the views task manager on views. I'll do a cleanup pass once

this stabilizes.

BUG=170370
TEST=make sure task manager works on windows and chromeos.
R=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12047022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178323 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 92 insertions, 129 deletions

diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
index f2293a0..7a01c9a 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -96,14 +96,6 @@ void TaskManagerBrowserTestUtil::WaitForWebResourceChange(int target_count) {
 // static
 void TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(
     Browser* browser) {
-#if defined(USE_AURA)
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,
-      content::Source<TaskManagerModel>(TaskManager::GetInstance()->model()));
   browser->window()->ShowTaskManager();
-  observer.Wait();
-#else
-  browser->window()->ShowTaskManager();
-#endif  // defined(USE_AURA)
 }
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index e97ae4c..16495f7 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -131,7 +131,6 @@
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/accelerator_table.h"
-#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/screen.h"
 #elif defined(OS_WIN)  // !defined(USE_AURA)
@@ -1098,19 +1097,11 @@ void BrowserView::ShowUpdateChromeDialog() {
 }
 
 void BrowserView::ShowTaskManager() {
-#if defined(USE_AURA)
-  TaskManagerDialog::Show();
-#else
   chrome::ShowTaskManager(browser());
-#endif  // defined(USE_AURA)
 }
 
 void BrowserView::ShowBackgroundPages() {
-#if defined(USE_AURA)
-  TaskManagerDialog::ShowBackgroundPages();
-#else
   chrome::ShowBackgroundPages(browser());
-#endif  // defined(USE_AURA)
 }
 
 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index aed565d..ca914e3 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -31,6 +31,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/table/group_table_model.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
@@ -128,8 +129,8 @@ void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
-void HungPagesTableModel::GetGroupRangeForItem(int item,
-                                               views::GroupRange* range) {
+void HungPagesTableModel::GetGroupRange(int model_index,
+                                        views::GroupRange* range) {
   DCHECK(range);
   range->start = 0;
   range->length = RowCount();
@@ -367,9 +368,10 @@ void HungRendererDialogView::Init() {
   hung_pages_table_model_.reset(new HungPagesTableModel(this));
   std::vector<ui::TableColumn> columns;
   columns.push_back(ui::TableColumn());
-  hung_pages_table_ = new views::GroupTableView(
+  hung_pages_table_ = new views::TableView(
       hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true,
-      false, true, false);
+      false, true);
+  hung_pages_table_->SetGrouper(hung_pages_table_model_.get());
 
   CreateKillButtonView();
 
diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h
index aa541c7..753ee90 100644
--- a/chrome/browser/ui/views/hung_renderer_view.h
+++ b/chrome/browser/ui/views/hung_renderer_view.h
@@ -8,9 +8,10 @@
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/base/models/table_model.h"
 #include "ui/views/controls/button/text_button.h"
-#include "ui/views/controls/table/group_table_model.h"
-#include "ui/views/controls/table/group_table_view.h"
+#include "ui/views/controls/table/table_grouper.h"
+#include "ui/views/controls/table/table_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace content {
@@ -18,7 +19,7 @@ class WebContents;
 }
 
 // Provides functionality to display information about a hung renderer.
-class HungPagesTableModel : public views::GroupTableModel {
+class HungPagesTableModel : public ui::TableModel, public views::TableGrouper {
  public:
   // The Delegate is notified any time a WebContents the model is listening to
   // is destroyed.
@@ -42,13 +43,15 @@ class HungPagesTableModel : public views::GroupTableModel {
   // Returns the first RenderViewHost, or NULL if there aren't any WebContents.
   content::RenderViewHost* GetRenderViewHost();
 
-  // Overridden from views::GroupTableModel:
+  // Overridden from ui::TableModel:
   virtual int RowCount() OVERRIDE;
   virtual string16 GetText(int row, int column_id) OVERRIDE;
   virtual gfx::ImageSkia GetIcon(int row) OVERRIDE;
   virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
-  virtual void GetGroupRangeForItem(int item, views::GroupRange* range)
-      OVERRIDE;
+
+  // Overridden from views::TableGrouper:
+  virtual void GetGroupRange(int model_index,
+                             views::GroupRange* range) OVERRIDE;
 
  private:
   // Used to track a single WebContents. If the WebContents is destroyed
@@ -150,7 +153,7 @@ class HungRendererDialogView : public views::DialogDelegateView,
   static void InitClass();
 
   // Controls within the dialog box.
-  views::GroupTableView* hung_pages_table_;
+  views::TableView* hung_pages_table_;
 
   // The button we insert into the ClientView to kill the errant process. This
   // is parented to a container view that uses a grid layout to align it
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index bc785d4..8a6d0b8 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -26,7 +26,9 @@
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
+#include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/chrome_style.h"
@@ -36,8 +38,10 @@
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/table/group_table_model.h"
-#include "ui/views/controls/table/group_table_view.h"
+#include "ui/views/controls/table/table_grouper.h"
+#include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
+#include "ui/views/controls/table/table_view_row_background_painter.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -56,8 +60,10 @@ namespace {
 // TaskManagerTableModel class
 ////////////////////////////////////////////////////////////////////////////////
 
-class TaskManagerTableModel : public views::GroupTableModel,
-                              public TaskManagerModelObserver {
+class TaskManagerTableModel
+    : public ui::TableModel,
+      public views::TableGrouper,
+      public TaskManagerModelObserver {
  public:
   explicit TaskManagerTableModel(TaskManagerModel* model)
       : model_(model),
@@ -69,19 +75,22 @@ class TaskManagerTableModel : public views::GroupTableModel,
     model_->RemoveObserver(this);
   }
 
-  // GroupTableModel.
-  int RowCount() OVERRIDE;
-  string16 GetText(int row, int column) OVERRIDE;
-  gfx::ImageSkia GetIcon(int row) OVERRIDE;
-  void GetGroupRangeForItem(int item, views::GroupRange* range) OVERRIDE;
-  void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
+  // TableModel overrides:
+  virtual int RowCount() OVERRIDE;
+  virtual string16 GetText(int row, int column) OVERRIDE;
+  virtual gfx::ImageSkia GetIcon(int row) OVERRIDE;
+  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
   virtual int CompareValues(int row1, int row2, int column_id) OVERRIDE;
 
-  // TaskManagerModelObserver.
-  virtual void OnModelChanged();
-  virtual void OnItemsChanged(int start, int length);
-  virtual void OnItemsAdded(int start, int length);
-  virtual void OnItemsRemoved(int start, int length);
+  // TableGrouper overrides:
+  virtual void GetGroupRange(int model_index,
+                             views::GroupRange* range) OVERRIDE;
+
+  // TaskManagerModelObserver overrides:
+  virtual void OnModelChanged() OVERRIDE;
+  virtual void OnItemsChanged(int start, int length) OVERRIDE;
+  virtual void OnItemsAdded(int start, int length) OVERRIDE;
+  virtual void OnItemsRemoved(int start, int length) OVERRIDE;
 
   // Returns true if resource corresponding to |row| is a background resource.
   bool IsBackgroundResource(int row);
@@ -105,14 +114,6 @@ gfx::ImageSkia TaskManagerTableModel::GetIcon(int row) {
   return model_->GetResourceIcon(row);
 }
 
-void TaskManagerTableModel::GetGroupRangeForItem(int item,
-                                                 views::GroupRange* range) {
-  TaskManagerModel::GroupRange range_pair =
-      model_->GetGroupRangeForResource(item);
-  range->start = range_pair.first;
-  range->length = range_pair.second;
-}
-
 void TaskManagerTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
@@ -121,6 +122,14 @@ int TaskManagerTableModel::CompareValues(int row1, int row2, int column_id) {
   return model_->CompareValues(row1, row2, column_id);
 }
 
+void TaskManagerTableModel::GetGroupRange(int model_index,
+                                          views::GroupRange* range) {
+  TaskManagerModel::GroupRange range_pair =
+      model_->GetGroupRangeForResource(model_index);
+  range->start = range_pair.first;
+  range->length = range_pair.second;
+}
+
 void TaskManagerTableModel::OnModelChanged() {
   if (observer_)
     observer_->OnModelChanged();
@@ -164,38 +173,22 @@ bool TaskManagerTableModel::IsBackgroundResource(int row) {
   return model_->IsBackgroundResource(row);
 }
 
-// Thin wrapper around GroupTableView to enable setting the background
-// resource highlight color.
-class BackgroundColorGroupTableView : public views::GroupTableView {
+class BackgroundPainter : public views::TableViewRowBackgroundPainter {
  public:
-  BackgroundColorGroupTableView(TaskManagerTableModel* model,
-                                const std::vector<ui::TableColumn>& columns,
-                                bool highlight_background_resources)
-      : views::GroupTableView(model, columns, views::ICON_AND_TEXT,
-                              false, true, true, true),
-        model_(model) {
-    SetCustomColorsEnabled(highlight_background_resources);
+  explicit BackgroundPainter(TaskManagerTableModel* model) : model_(model) {}
+  virtual ~BackgroundPainter() {}
+
+  virtual void PaintRowBackground(int model_index,
+                                  const gfx::Rect& row_bounds,
+                                  gfx::Canvas* canvas) OVERRIDE {
+    if (model_->IsBackgroundResource(model_index))
+      canvas->FillRect(row_bounds, kBackgroundResourceHighlight);
   }
 
-  virtual ~BackgroundColorGroupTableView() {}
-
  private:
-  virtual bool GetCellColors(int model_row,
-                             int column,
-                             ItemColor* foreground,
-                             ItemColor* background,
-                             LOGFONT* logfont) {
-    if (!model_->IsBackgroundResource(model_row))
-      return false;
-
-    // Render background resources with a yellow highlight.
-    background->color_is_set = true;
-    background->color = kBackgroundResourceHighlight;
-    foreground->color_is_set = false;
-    return true;
-  }
-
   TaskManagerTableModel* model_;
+
+  DISALLOW_COPY_AND_ASSIGN(BackgroundPainter);
 };
 
 // The Task manager UI container.
@@ -277,7 +270,8 @@ class TaskManagerView : public views::ButtonListener,
   views::TextButton* purge_memory_button_;
   views::TextButton* kill_button_;
   views::Link* about_memory_link_;
-  views::GroupTableView* tab_table_;
+  views::TableView* tab_table_;
+  views::View* tab_table_parent_;
 
   TaskManager* task_manager_;
 
@@ -319,6 +313,7 @@ TaskManagerView::TaskManagerView(bool highlight_background_resources,
       kill_button_(NULL),
       about_memory_link_(NULL),
       tab_table_(NULL),
+      tab_table_parent_(NULL),
       task_manager_(TaskManager::GetInstance()),
       model_(TaskManager::GetInstance()->model()),
       is_always_on_top_(false),
@@ -385,8 +380,15 @@ void TaskManagerView::Init() {
                       ui::TableColumn::RIGHT, -1, 0));
   columns_.back().sortable = true;
 
-  tab_table_ = new BackgroundColorGroupTableView(
-      table_model_.get(), columns_, highlight_background_resources_);
+  tab_table_ = new views::TableView(
+      table_model_.get(), columns_, views::ICON_AND_TEXT, false, true, true);
+  tab_table_->SetGrouper(table_model_.get());
+  if (highlight_background_resources_) {
+    scoped_ptr<BackgroundPainter> painter(
+        new BackgroundPainter(table_model_.get()));
+    tab_table_->SetRowBackgroundPainter(
+        painter.PassAs<views::TableViewRowBackgroundPainter>());
+  }
 
   // Hide some columns by default
   tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, false);
@@ -471,7 +473,8 @@ void TaskManagerView::ViewHierarchyChanged(bool is_add,
       if (purge_memory_button_)
         parent->AddChildView(purge_memory_button_);
       parent->AddChildView(kill_button_);
-      AddChildView(tab_table_);
+      tab_table_parent_ = tab_table_->CreateParentIfNecessary();
+      AddChildView(tab_table_parent_);
     } else {
       parent->RemoveChildView(kill_button_);
       if (purge_memory_button_)
@@ -508,7 +511,7 @@ void TaskManagerView::Layout() {
     rect.Inset(views::kPanelHorizMargin, views::kPanelVertMargin);
   rect.Inset(0, 0, 0,
              kill_button_->height() + views::kUnrelatedControlVerticalSpacing);
-  tab_table_->SetBoundsRect(rect);
+  tab_table_parent_->SetBoundsRect(rect);
 }
 
 gfx::Size TaskManagerView::GetPreferredSize() {
@@ -555,10 +558,13 @@ void TaskManagerView::ButtonPressed(
   if (purge_memory_button_ && (sender == purge_memory_button_)) {
     MemoryPurger::PurgeAll();
   } else {
+    typedef ui::ListSelectionModel::SelectedIndices SelectedIndices;
     DCHECK_EQ(kill_button_, sender);
-    for (views::TableSelectionIterator iter  = tab_table_->SelectionBegin();
-         iter != tab_table_->SelectionEnd(); ++iter)
-      task_manager_->KillProcess(*iter);
+    SelectedIndices selection(tab_table_->selection_model().selected_indices());
+    for (SelectedIndices::const_reverse_iterator i = selection.rbegin();
+         i != selection.rend(); ++i) {
+      task_manager_->KillProcess(*i);
+    }
   }
 }
 
@@ -628,16 +634,17 @@ void TaskManagerView::WindowClosing() {
 
 // views::TableViewObserver implementation.
 void TaskManagerView::OnSelectionChanged() {
+  const ui::ListSelectionModel::SelectedIndices& selection(
+      tab_table_->selection_model().selected_indices());
   bool selection_contains_browser_process = false;
-  for (views::TableSelectionIterator iter  = tab_table_->SelectionBegin();
-       iter != tab_table_->SelectionEnd(); ++iter) {
-    if (task_manager_->IsBrowserProcess(*iter)) {
+  for (size_t i = 0; i < selection.size(); ++i) {
+    if (task_manager_->IsBrowserProcess(selection[i])) {
       selection_contains_browser_process = true;
       break;
     }
   }
   kill_button_->SetEnabled(!selection_contains_browser_process &&
-                           tab_table_->SelectedRowCount() > 0);
+                           !selection.empty());
 }
 
 void TaskManagerView::OnDoubleClick() {
@@ -697,13 +704,9 @@ void TaskManagerView::InitAlwaysOnTopState() {
 }
 
 void TaskManagerView::ActivateFocusedTab() {
-  int row_count = tab_table_->RowCount();
-  for (int i = 0; i < row_count; ++i) {
-    if (tab_table_->ItemHasTheFocus(i)) {
-      task_manager_->ActivateProcess(i);
-      break;
-    }
-  }
+  const int active_row = tab_table_->selection_model().active();
+  if (active_row != -1)
+    task_manager_->ActivateProcess(active_row);
 }
 
 void TaskManagerView::AddAlwaysOnTopSystemMenuItem() {
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 3044241..84ecc64 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -51,7 +51,6 @@
 #include "chrome/browser/ui/webui/quota_internals_ui.h"
 #include "chrome/browser/ui/webui/signin_internals_ui.h"
 #include "chrome/browser/ui/webui/sync_internals_ui.h"
-#include "chrome/browser/ui/webui/task_manager/task_manager_ui.h"
 #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/tracing_ui.h"
 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
@@ -334,10 +333,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   if (url.host() == chrome::kChromeUIPolicyHost)
     return &NewWebUI<PolicyUI>;
 #endif
-#if defined(USE_AURA)
-  if (url.host() == chrome::kChromeUITaskManagerHost)
-    return &NewWebUI<TaskManagerUI>;
-#endif  // defined(USE_AURA)
 
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
   if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index e712f2c..8a243cb 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2413,11 +2413,11 @@
             ['exclude', '^browser/ui/views/tabs/native_view_photobooth.h'],
             ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.cc'],
             ['exclude', '^browser/ui/views/tabs/native_view_photobooth_win.h'],
-            ['exclude', '^browser/ui/views/task_manager_view.cc'],
             ['exclude', '^browser/ui/views/user_data_dir_dialog_view.cc'],
             ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.cc'],
             ['exclude', '^browser/ui/views/tab_contents/web_drag_bookmark_handler_win.h'],
             ['exclude', '^browser/ui/webui/help/version_updater_win.cc'],
+            ['exclude', '^browser/ui/webui/task_manager/'],
             ['exclude', '^browser/ui/window_sizer/window_sizer_win.cc'],
             # TODO: (stevenjb/beng): Find a home for these.
             ['include', '^browser/ui/views/simple_message_box_views.cc'],
diff --git a/ui/views/controls/table/group_table_view.h b/ui/views/controls/table/group_table_view.h
index 35256b1..b0f6a15 100644
--- a/ui/views/controls/table/group_table_view.h
+++ b/ui/views/controls/table/group_table_view.h
@@ -5,10 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #define UI_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/views/controls/table/group_table_view_win.h"
-#else
+// TODO(sky): clean this up once TableViewViews stabilizes.
 #include "ui/views/controls/table/group_table_view_views.h"
-#endif
 
 #endif  // UI_VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h
index e334c44..2547235 100644
--- a/ui/views/controls/table/table_view.h
+++ b/ui/views/controls/table/table_view.h
@@ -5,10 +5,7 @@
 #ifndef UI_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 #define UI_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/views/controls/table/table_view_win.h"
-#else
+// TODO(sky): clean this up once TableViewViews stabilizes.
 #include "ui/views/controls/table/table_view_views.h"
-#endif
 
 #endif  // UI_VIEWS_CONTROLS_TABLE_TABLE_VIEW_H_
diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc
index 5b14c5a..81e782e 100644
--- a/ui/views/controls/table/table_view_unittest.cc
+++ b/ui/views/controls/table/table_view_unittest.cc
@@ -4,6 +4,8 @@
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 
+// TODO(sky): nuke this once TableViewViews stabilizes.
+
 #include "build/build_config.h"
 
 #include <atlbase.h>  // NOLINT
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 9e1670e..2795b53 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -207,8 +207,6 @@
         'controls/table/group_table_view.h',
         'controls/table/group_table_view_views.cc',
         'controls/table/group_table_view_views.h',
-        'controls/table/group_table_view_win.cc',
-        'controls/table/group_table_view_win.h',
         'controls/table/table_header.cc',
         'controls/table/table_header.h',
         'controls/table/table_utils.cc',
@@ -218,8 +216,6 @@
         'controls/table/table_view_row_background_painter.h',
         'controls/table/table_view_views.cc',
         'controls/table/table_view_views.h',
-        'controls/table/table_view_win.cc',
-        'controls/table/table_view_win.h',
         'controls/textfield/native_textfield_views.cc',
         'controls/textfield/native_textfield_views.h',
         'controls/textfield/native_textfield_win.cc',
@@ -498,15 +494,6 @@
           'sources!': [
             'controls/menu/menu_config_views.cc',
             'controls/menu/menu_separator_views.cc',
-            'controls/table/group_table_view_views.cc',
-            'controls/table/group_table_view_views.h',
-            'controls/table/table_header.cc',
-            'controls/table/table_header.h',
-            'controls/table/table_utils.cc',
-            'controls/table/table_utils.h',
-            'controls/table/table_view_row_background_painter.h',
-            'controls/table/table_view_views.cc',
-            'controls/table/table_view_views.h',
           ],
         }],
         ['use_aura==1 and OS=="win"', {
@@ -671,7 +658,6 @@
         'controls/slider_unittest.cc',
         'controls/tabbed_pane/tabbed_pane_unittest.cc',
         'controls/table/table_utils_unittest.cc',
-        'controls/table/table_view_unittest.cc',
         'controls/table/table_view_views_unittest.cc',
         'controls/table/test_table_model.cc',
         'controls/table/test_table_model.h',
@@ -720,10 +706,6 @@
         ['use_aura==0 and OS=="win"', {
           'sources/': [
             ['exclude', 'controls/combobox/native_combobox_views_unittest.cc'],
-            ['exclude', 'controls/table/table_utils_unittest.cc'],
-            ['exclude', 'controls/table/table_view_views_unittest.cc'],
-            ['exclude', 'controls/table/test_table_model.cc'],
-            ['exclude', 'controls/table/test_table_model.h'],
             ['exclude', 'controls/tree/tree_view_views_unittest.cc'],
           ],
         }],
@@ -732,7 +714,6 @@
             '../aura/aura.gyp:aura_test_support',
           ],
           'sources/': [
-            ['exclude', 'controls/table/table_view_unittest.cc'],
             ['exclude', 'widget/native_widget_win_unittest.cc'],
           ],
         }, {