Move TableModel out of views/ and into app/....

chrome/browser/views/bookmark_table_view.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/bookmark_table_view.h"
 
 #include <commctrl.h>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view_constants.h"
 
 namespace {
 
 // Height of the drop indicator used when dropping between rows.
 const int kDropHighlightHeight = 2;
 
-int GetWidthOfColumn(const std::vector<views::TableColumn>& columns,
+int GetWidthOfColumn(const std::vector<TableColumn>& columns,
                      const std::vector<int> widths,
                      int column_id) {
   for (size_t i = 0; i < columns.size(); ++i) {
     if (columns[i].id == column_id)
       return widths[i];
   }
   NOTREACHED();
   return -1;
 }
 
 }  // namespace
 
 void BookmarkTableView::DropInfo::Scrolled() {
   view_->UpdateDropInfo();
 }
 
 BookmarkTableView::BookmarkTableView(Profile* profile,
                                      BookmarkTableModel* model)
-    : views::TableView(model, std::vector<views::TableColumn>(),
+    : views::TableView(model, std::vector<TableColumn>(),
                        views::ICON_AND_TEXT, false, true, true),
       profile_(profile),
       show_path_column_(false) {
   UpdateColumns();
 }
 
 bool BookmarkTableView::CanDrop(const OSExchangeData& data) {
   if (!parent_node_ || !profile_->GetBookmarkModel()->IsLoaded())
     return false;
 
@@ skipping 294 matching lines @@
   } else {
     ListView_GetItemRect(GetNativeControlHWND(), index, &bounds, LVIR_BOUNDS);
     bounds.top -= kDropHighlightHeight / 2;
   }
   bounds.bottom = bounds.top + kDropHighlightHeight;
   return bounds;
 }
 
 void BookmarkTableView::UpdateColumns() {
   PrefService* prefs = profile_->GetPrefs();
-  views::TableColumn name_column =
-      views::TableColumn(IDS_BOOKMARK_TABLE_TITLE, views::TableColumn::LEFT,
-                         -1);
-  views::TableColumn url_column =
-      views::TableColumn(IDS_BOOKMARK_TABLE_URL, views::TableColumn::LEFT, -1);
-  views::TableColumn path_column =
-      views::TableColumn(IDS_BOOKMARK_TABLE_PATH, views::TableColumn::LEFT, -1);
+  TableColumn name_column =
+      TableColumn(IDS_BOOKMARK_TABLE_TITLE, TableColumn::LEFT, -1);
+  TableColumn url_column =
+      TableColumn(IDS_BOOKMARK_TABLE_URL, TableColumn::LEFT, -1);
+  TableColumn path_column =
+      TableColumn(IDS_BOOKMARK_TABLE_PATH, TableColumn::LEFT, -1);
 
-  std::vector<views::TableColumn> columns;
+  std::vector<TableColumn> columns;
   if (show_path_column_) {
     int name_width = -1;
     int url_width = -1;
     int path_width = -1;
     if (prefs) {
       name_width = prefs->GetInteger(prefs::kBookmarkTableNameWidth2);
       url_width = prefs->GetInteger(prefs::kBookmarkTableURLWidth2);
       path_width = prefs->GetInteger(prefs::kBookmarkTablePathWidth);
     }
     if (name_width != -1 && url_width != -1 && path_width != -1) {
@@ skipping 55 matching lines @@
   gfx::Rect client_rect(client_rect_rect);
   gfx::Font font = GetAltTextFont();
   // Pad height by 2 for halo.
   return gfx::Rect(kXOffset, content_offset(), client_rect.width() - kXOffset,
                    std::max(kImageSize, font.height() + 2));
 }
 
 gfx::Font BookmarkTableView::GetAltTextFont() {
   return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 }