views: Fix a couple of other trivial TODOs.

views/controls/table/group_table_view.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #define VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #pragma once
 
 #include "base/task.h"
 #include "ui/base/models/table_model.h"
 #include "views/controls/table/table_view.h"
 
 // The GroupTableView adds grouping to the TableView class.
 // It allows to have groups of rows that act as a single row from the selection
 // perspective. Groups are visually separated by a horizontal line.
 
 namespace views {
 
 struct GroupRange {
   int start;
   int length;
 };
 
 // The model driving the GroupTableView.
-class GroupTableModel : public TableModel {
+class GroupTableModel : public ui::TableModel {
  public:
   // Populates the passed range with the first row/last row (included)
   // that this item belongs to.
   virtual void GetGroupRangeForItem(int item, GroupRange* range) = 0;
 };
 
 class VIEWS_EXPORT GroupTableView : public TableView {
  public:
    // The view class name.
    static const char kViewClassName[];
 
   GroupTableView(GroupTableModel* model,
-                 const std::vector<TableColumn>& columns,
+                 const std::vector<ui::TableColumn>& columns,
                  TableTypes table_type, bool single_selection,
                  bool resizable_columns, bool autosize_columns,
                  bool draw_group_separators);
   virtual ~GroupTableView();
 
   virtual std::string GetClassName() const;
 
  protected:
   // Notification from the ListView that the selected state of an item has
   // changed.
@@ skipping 30 matching lines @@
 
   // Maps from model row to start of group.
   std::map<int,int> model_index_to_range_start_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GroupTableView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_