views: Fix a couple of other trivial TODOs.

views/controls/table/native_table_win.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/controls/table/native_table_win.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include "base/logging.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/icon_util.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/widget/widget.h"
 
-using ui::TableColumn;
-
 namespace views {
 
 // Added to column width to prevent truncation.
 const int kListViewTextPadding = 15;
 // Additional column width necessary if column has icons.
 const int kListViewIconWidthAndPadding = 18;
 
 // static
 const int NativeTableWin::kImageSize = 18;
 
@@ skipping 17 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTableWin, NativeTableWrapper implementation:
 
 int NativeTableWin::GetRowCount() const {
   if (!native_view())
     return 0;
   return ListView_GetItemCount(native_view());
 }
 
-void NativeTableWin::InsertColumn(const TableColumn& tc, int index) {
+void NativeTableWin::InsertColumn(const ui::TableColumn& tc, int index) {
   if (!native_view())
     return;
 
   LVCOLUMN column = { 0 };
   column.mask = LVCF_TEXT|LVCF_FMT;
   column.pszText = const_cast<LPWSTR>(tc.title.c_str());
   switch (tc.alignment) {
-      case TableColumn::LEFT:
+      case ui::TableColumn::LEFT:
         column.fmt = LVCFMT_LEFT;
         break;
-      case TableColumn::RIGHT:
+      case ui::TableColumn::RIGHT:
         column.fmt = LVCFMT_RIGHT;
         break;
-      case TableColumn::CENTER:
+      case ui::TableColumn::CENTER:
         column.fmt = LVCFMT_CENTER;
         break;
       default:
         NOTREACHED();
   }
   if (tc.width != -1) {
     column.mask |= LVCF_WIDTH;
     column.cx = tc.width;
   }
   column.mask |= LVCF_SUBITEM;
@@ skipping 198 matching lines @@
         // Prevent clicks so columns cannot be resized.
         if (!table_->resizable_columns())
           return true;
         break;
 
       case NM_DBLCLK:
         OnDoubleClick();
         break;
 
       case LVN_COLUMNCLICK: {
-        const TableColumn& column = table_->GetVisibleColumnAt(
+        const ui::TableColumn& column = table_->GetVisibleColumnAt(
             reinterpret_cast<NMLISTVIEW*>(hdr)->iSubItem);
         break;
       }
 
       case LVN_MARQUEEBEGIN:  // We don't want the marquee selection.
         return true;
 
       case LVN_GETINFOTIP: {
         // This is called when the user hovers items in column zero.
         //   * If the text in this column is not fully visible, the dwFlags
@@ skipping 272 matching lines @@
     }
   }
 
   memset(&item, 0, sizeof(LVITEM));
   item.stateMask = 0;
   item.mask = LVIF_TEXT;
   if (table_->type() == ICON_AND_TEXT)
     item.mask |= LVIF_IMAGE;
 
   for (size_t j = start_column; j < table_->GetVisibleColumnCount(); ++j) {
-    TableColumn col = table_->GetVisibleColumnAt(j);
+    ui::TableColumn col = table_->GetVisibleColumnAt(j);
     int max_text_width = ListView_GetStringWidth(native_view(),
                                                  col.title.c_str());
     for (int i = start; i < max_row; ++i) {
       item.iItem = i;
       item.iSubItem = j;
       std::wstring text = table_->model()->GetText(i, col.id);
       item.pszText = const_cast<LPWSTR>(text.c_str());
       item.iImage = 0;
       ListView_SetItem(native_view(), &item);
 
@@ skipping 303 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTableWrapper, public:
 
 // static
 NativeTableWrapper* NativeTableWrapper::CreateNativeWrapper(TableView2* table) {
   return new NativeTableWin(table);
 }
 
 }  // namespace views