views: Fix a couple of other trivial TODOs.

views/examples/table2_example.cc

 // 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.
 
 #include "views/examples/table2_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/table/table_view2.h"
@@ skipping 22 matching lines @@
   column3_visible_checkbox_ = new views::Checkbox(L"Origin column visible");
   column3_visible_checkbox_->SetChecked(true);
   column3_visible_checkbox_->set_listener(this);
   column4_visible_checkbox_ = new views::Checkbox(L"Price column visible");
   column4_visible_checkbox_->SetChecked(true);
   column4_visible_checkbox_->set_listener(this);
 
   views::GridLayout* layout = new views::GridLayout(container);
   container->SetLayoutManager(layout);
 
-  std::vector<TableColumn> columns;
+  std::vector<ui::TableColumn> columns;
   columns.push_back(
-      TableColumn(0, ASCIIToUTF16("Fruit"), TableColumn::LEFT, 100));
+      ui::TableColumn(0, ASCIIToUTF16("Fruit"), ui::TableColumn::LEFT, 100));
   columns.push_back(
-      TableColumn(1, ASCIIToUTF16("Color"), TableColumn::LEFT, 100));
+      ui::TableColumn(1, ASCIIToUTF16("Color"), ui::TableColumn::LEFT, 100));
   columns.push_back(
-      TableColumn(2, ASCIIToUTF16("Origin"), TableColumn::LEFT, 100));
+      ui::TableColumn(2, ASCIIToUTF16("Origin"), ui::TableColumn::LEFT, 100));
   columns.push_back(
-      TableColumn(3, ASCIIToUTF16("Price"), TableColumn::LEFT, 100));
+      ui::TableColumn(3, ASCIIToUTF16("Price"), ui::TableColumn::LEFT, 100));
   const int options = (views::TableView2::SINGLE_SELECTION |
                        views::TableView2::RESIZABLE_COLUMNS |
                        views::TableView2::AUTOSIZE_COLUMNS |
                        views::TableView2::HORIZONTAL_LINES |
                        views::TableView2::VERTICAL_LINES);
   table_ = new views::TableView2(this, columns, views::ICON_AND_TEXT, options);
   table_->SetObserver(this);
   icon1_.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
   icon1_.allocPixels();
   SkCanvas canvas1(icon1_);
@@ skipping 40 matching lines @@
     { "Strawberries", "Red", "California", "$7" },
     { "Cantaloupe", "Orange", "South america", "$5" }
   };
   return ASCIIToUTF16(cells[row % 5][column_id]);
 }
 
 SkBitmap Table2Example::GetIcon(int row) {
   return row % 2 ? icon1_ : icon2_;
 }
 
-void Table2Example::SetObserver(TableModelObserver* observer) {
+void Table2Example::SetObserver(ui::TableModelObserver* observer) {
 }
 
 void Table2Example::ButtonPressed(views::Button* sender,
                                   const views::Event& event) {
   int index = 0;
   bool show = true;
   if (sender == column1_visible_checkbox_) {
     index = 0;
     show = column1_visible_checkbox_->checked();
   } else if (sender == column2_visible_checkbox_) {
@@ skipping 22 matching lines @@
 void Table2Example::OnKeyDown(ui::KeyboardCode virtual_keycode) {
 }
 
 void Table2Example::OnTableViewDelete(views::TableView* table_view) {
 }
 
 void Table2Example::OnTableView2Delete(views::TableView2* table_view) {
 }
 
 }  // namespace examples