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

chrome/browser/views/options/cookies_view.cc

 // Copyright (c) 2009 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/options/cookies_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "app/table_model.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "views/border.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/button/native_button.h"
-#include "views/controls/table/table_model.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
 
 // static
 views::Window* CookiesView::instance_ = NULL;
 static const int kCookieInfoViewBorderSize = 1;
 static const int kCookieInfoViewInsetSize = 3;
 static const int kSearchFilterDelayMs = 500;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTableModel
 
-class CookiesTableModel : public views::TableModel {
+class CookiesTableModel : public TableModel {
  public:
   explicit CookiesTableModel(Profile* profile);
   virtual ~CookiesTableModel() {}
 
   // Returns information about the Cookie at the specified index.
   std::string GetDomainAt(int index);
   net::CookieMonster::CanonicalCookie& GetCookieAt(int index);
 
   // Remove the specified cookies from the Cookie Monster and update the view.
   void RemoveCookies(int start_index, int remove_count);
   void RemoveAllShownCookies();
 
-  // views::TableModel implementation:
+  // TableModel implementation:
   virtual int RowCount();
   virtual std::wstring GetText(int row, int column_id);
   virtual SkBitmap GetIcon(int row);
-  virtual void SetObserver(views::TableModelObserver* observer);
+  virtual void SetObserver(TableModelObserver* observer);
   virtual int CompareValues(int row1, int row2, int column_id);
 
   // Filter the cookies to only display matched results.
   void UpdateSearchResults(const std::wstring& filter);
 
  private:
   void LoadCookies();
   void DoFilter();
 
   std::wstring filter_;
 
   // The profile from which this model sources cookies.
   Profile* profile_;
 
   typedef net::CookieMonster::CookieList CookieList;
   typedef std::vector<net::CookieMonster::CookieListPair*> CookiePtrList;
   CookieList all_cookies_;
   CookiePtrList shown_cookies_;
 
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CookiesTableModel);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTableModel, public:
 
 CookiesTableModel::CookiesTableModel(Profile* profile)
     : profile_(profile) {
   LoadCookies();
@@ skipping 43 matching lines @@
   // all_cookies as dead instead of deleting, but this should be fine for now.
   DoFilter();
   observer_->OnItemsRemoved(start_index, remove_count);
 }
 
 void CookiesTableModel::RemoveAllShownCookies() {
   RemoveCookies(0, RowCount());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CookiesTableModel, views::TableModel implementation:
+// CookiesTableModel, TableModel implementation:
 
 int CookiesTableModel::RowCount() {
   return static_cast<int>(shown_cookies_.size());
 }
 
 std::wstring CookiesTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
   switch (column_id) {
     case IDS_COOKIES_DOMAIN_COLUMN_HEADER:
       {
@@ skipping 21 matching lines @@
   NOTREACHED();
   return L"";
 }
 
 SkBitmap CookiesTableModel::GetIcon(int row) {
   static SkBitmap* icon = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_COOKIE_ICON);
   return *icon;
 }
 
-void CookiesTableModel::SetObserver(views::TableModelObserver* observer) {
+void CookiesTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 int CookiesTableModel::CompareValues(int row1, int row2, int column_id) {
   if (column_id == IDS_COOKIES_DOMAIN_COLUMN_HEADER) {
     // Sort ignore the '.' prefix for domain cookies.
     net::CookieMonster::CookieListPair* cp1 = shown_cookies_[row1];
     net::CookieMonster::CookieListPair* cp2 = shown_cookies_[row2];
     bool is1domain = !cp1->first.empty() && cp1->first[0] == '.';
     bool is2domain = !cp2->first.empty() && cp2->first[0] == '.';
@@ skipping 54 matching lines @@
   observer_->OnModelChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTableView
 //  Overridden to handle Delete key presses
 
 class CookiesTableView : public views::TableView {
  public:
   CookiesTableView(CookiesTableModel* cookies_model,
-                   std::vector<views::TableColumn> columns);
+                   std::vector<TableColumn> columns);
   virtual ~CookiesTableView() {}
 
   // Removes the cookies associated with the selected rows in the TableView.
   void RemoveSelectedCookies();
 
  private:
   // Our model, as a CookiesTableModel.
   CookiesTableModel* cookies_model_;
 
   DISALLOW_COPY_AND_ASSIGN(CookiesTableView);
 };
 
 CookiesTableView::CookiesTableView(
     CookiesTableModel* cookies_model,
-    std::vector<views::TableColumn> columns)
+    std::vector<TableColumn> columns)
     : views::TableView(cookies_model, columns, views::ICON_AND_TEXT, false,
                        true, true),
       cookies_model_(cookies_model) {
 }
 
 void CookiesTableView::RemoveSelectedCookies() {
   // It's possible that we don't have anything selected.
   if (SelectedRowCount() <= 0)
     return;
 
@@ skipping 332 matching lines @@
 void CookiesView::ContentsChanged(views::Textfield* sender,
                                   const std::wstring& new_contents) {
   search_update_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       search_update_factory_.NewRunnableMethod(
           &CookiesView::UpdateSearchResults), kSearchFilterDelayMs);
 }
 
 bool CookiesView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
-  if (views::Textfield::IsKeystrokeEscape(key)) { 
+  if (views::Textfield::IsKeystrokeEscape(key)) {
     ResetSearchQuery();
   } else if (views::Textfield::IsKeystrokeEnter(key)) {
     search_update_factory_.RevokeAll();
     UpdateSearchResults();
   }
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, views::DialogDelegate implementation:
@@ skipping 67 matching lines @@
   search_field_ = new views::Textfield;
   search_field_->SetController(this);
   clear_search_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_COOKIES_CLEAR_SEARCH_LABEL));
   description_label_ = new views::Label(
       l10n_util::GetString(IDS_COOKIES_INFO_LABEL));
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   cookies_table_model_.reset(new CookiesTableModel(profile_));
   info_view_ = new CookieInfoView;
-  std::vector<views::TableColumn> columns;
-  columns.push_back(views::TableColumn(IDS_COOKIES_DOMAIN_COLUMN_HEADER,
-                                       views::TableColumn::LEFT, 200, 0.5f));
+  std::vector<TableColumn> columns;
+  columns.push_back(TableColumn(IDS_COOKIES_DOMAIN_COLUMN_HEADER,
+                                TableColumn::LEFT, 200, 0.5f));
   columns.back().sortable = true;
-  columns.push_back(views::TableColumn(IDS_COOKIES_NAME_COLUMN_HEADER,
-                                       views::TableColumn::LEFT, 150, 0.5f));
+  columns.push_back(TableColumn(IDS_COOKIES_NAME_COLUMN_HEADER,
+                                TableColumn::LEFT, 150, 0.5f));
   columns.back().sortable = true;
   cookies_table_ = new CookiesTableView(cookies_table_model_.get(), columns);
   cookies_table_->SetObserver(this);
   // Make the table initially sorted by domain.
   views::TableView::SortDescriptors sort;
   sort.push_back(
       views::TableView::SortDescriptor(IDS_COOKIES_DOMAIN_COLUMN_HEADER,
                                        true));
   cookies_table_->SetSortDescriptors(sort);
   remove_button_ = new views::NativeButton(
@@ skipping 52 matching lines @@
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(EmptyWString());
   UpdateSearchResults();
 }
 
 void CookiesView::UpdateForEmptyState() {
   info_view_->ClearCookieDisplay();
   remove_button_->SetEnabled(false);
   remove_all_button_->SetEnabled(false);
 }