views: Fix a couple of other trivial TODOs.

views/controls/table/table_view2.cc

Index: views/controls/table/table_view2.cc
diff --git a/views/controls/table/table_view2.cc b/views/controls/table/table_view2.cc
index 52eef372adcb9a293f423ddde665ddd4e0820632..e387066fb01d2ed9afc0fcfe2c914a1376b44700 100644
--- a/views/controls/table/table_view2.cc
+++ b/views/controls/table/table_view2.cc
@@ -1,5 +1,4 @@
-
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,14 +9,12 @@
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
 
-using ui::TableColumn;
-
 namespace views {
 
 // TableView2 ------------------------------------------------------------------
 
-TableView2::TableView2(TableModel* model,
-                       const std::vector<TableColumn>& columns,
+TableView2::TableView2(ui::TableModel* model,
+                       const std::vector<ui::TableColumn>& columns,
                        TableTypes table_type,
                        int options)
     : model_(model),
@@ -40,7 +37,7 @@ TableView2::~TableView2() {
     model_->SetObserver(NULL);
 }
 
-void TableView2::SetModel(TableModel* model) {
+void TableView2::SetModel(ui::TableModel* model) {
   if (model == model_)
     return;
 
@@ -159,18 +156,18 @@ void TableView2::OnItemsRemoved(int start, int length) {
   native_wrapper_->OnRowsRemoved(start, length);
 }
 
-void TableView2::AddColumn(const TableColumn& col) {
+void TableView2::AddColumn(const ui::TableColumn& col) {
   DCHECK_EQ(0U, all_columns_.count(col.id));
   all_columns_[col.id] = col;
 }
 
-void TableView2::SetColumns(const std::vector<TableColumn>& columns) {
+void TableView2::SetColumns(const std::vector<ui::TableColumn>& columns) {
   // Remove the currently visible columns.
   while (!visible_columns_.empty())
     SetColumnVisibility(visible_columns_.front(), false);
 
   all_columns_.clear();
-  for (std::vector<TableColumn>::const_iterator i = columns.begin();
+  for (std::vector<ui::TableColumn>::const_iterator i = columns.begin();
        i != columns.end(); ++i) {
     AddColumn(*i);
   }
@@ -210,7 +207,7 @@ void TableView2::SetColumnVisibility(int id, bool is_visible) {
   if (is_visible) {
     DCHECK(native_wrapper_);
     visible_columns_.push_back(id);
-    TableColumn& column = all_columns_[id];
+    ui::TableColumn& column = all_columns_[id];
     native_wrapper_->InsertColumn(column, column_count_);
     changed = true;
   }
@@ -249,7 +246,7 @@ void TableView2::ResetColumnSizes() {
 
   for (std::vector<int>::const_iterator i = visible_columns_.begin();
        i != visible_columns_.end(); ++i) {
-    TableColumn& col = all_columns_[*i];
+    ui::TableColumn& col = all_columns_[*i];
     int col_index = static_cast<int>(i - visible_columns_.begin());
     if (col.width == -1) {
       if (col.percent > 0) {
@@ -267,7 +264,7 @@ void TableView2::ResetColumnSizes() {
   int available_width = width - fixed_width - autosize_width;
   for (std::vector<int>::const_iterator i = visible_columns_.begin();
        i != visible_columns_.end(); ++i) {
-    TableColumn& col = all_columns_[*i];
+    ui::TableColumn& col = all_columns_[*i];
     if (col.width == -1) {
       int col_index = static_cast<int>(i - visible_columns_.begin());
       if (col.percent > 0) {
@@ -316,8 +313,8 @@ void TableView2::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   }
 }
 
-void TableView2::Init(const std::vector<TableColumn>& columns) {
-  for (std::vector<TableColumn>::const_iterator i = columns.begin();
+void TableView2::Init(const std::vector<ui::TableColumn>& columns) {
+  for (std::vector<ui::TableColumn>::const_iterator i = columns.begin();
       i != columns.end(); ++i) {
     AddColumn(*i);
     visible_columns_.push_back(i->id);
@@ -328,9 +325,9 @@ gfx::NativeView TableView2::GetTestingHandle() {
   return native_wrapper_->GetTestingHandle();
 }
 
-TableColumn TableView2::GetVisibleColumnAt(int index) {
+ui::TableColumn TableView2::GetVisibleColumnAt(int index) {
   DCHECK(index < static_cast<int>(visible_columns_.size()));
-  std::map<int, TableColumn>::iterator iter =
+  std::map<int, ui::TableColumn>::iterator iter =
       all_columns_.find(index);
   DCHECK(iter != all_columns_.end());
   return iter->second;