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

chrome/browser/views/options/general_page_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/general_page_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/png_decoder.h"
 #include "base/message_loop.h"
@@ skipping 153 matching lines @@
     general_page_view_->SetDefaultBrowserUIState(state);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomHomePagesTableModel
 
 // CustomHomePagesTableModel is the model for the TableView showing the list
 // of pages the user wants opened on startup.
 
-class CustomHomePagesTableModel : public views::TableModel {
+class CustomHomePagesTableModel : public TableModel {
  public:
   explicit CustomHomePagesTableModel(Profile* profile);
   virtual ~CustomHomePagesTableModel() {}
 
   // Sets the set of urls that this model contains.
   void SetURLs(const std::vector<GURL>& urls);
 
   // Adds an entry at the specified index.
   void Add(int index, const GURL& url);
 
   // Removes the entry at the specified index.
   void Remove(int index);
 
   // Returns the set of urls this model contains.
   std::vector<GURL> GetURLs();
 
-  // views::TableModel overrides:
+  // TableModel overrides:
   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);
 
  private:
   // Each item in the model is represented as an Entry. Entry stores the URL
   // and favicon of the page.
   struct Entry {
     Entry() : fav_icon_handle(0) {}
 
     // URL of the page.
     GURL url;
 
@@ skipping 23 matching lines @@
 
   // Set of entries we're showing.
   std::vector<Entry> entries_;
 
   // Default icon to show when one can't be found for the URL.
   static SkBitmap default_favicon_;
 
   // Profile used to load icons.
   Profile* profile_;
 
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   // Used in loading favicons.
   CancelableRequestConsumer fav_icon_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
 };
 
 // static
 SkBitmap CustomHomePagesTableModel::default_favicon_;
 
@@ skipping 60 matching lines @@
   return net::FormatUrl(entries_[row].url, languages);
 }
 
 SkBitmap CustomHomePagesTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
   if (!entries_[row].icon.isNull())
     return entries_[row].icon;
   return default_favicon_;
 }
 
-void CustomHomePagesTableModel::SetObserver(
-    views::TableModelObserver* observer) {
+void CustomHomePagesTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 void CustomHomePagesTableModel::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
@@ skipping 459 matching lines @@
   startup_add_custom_page_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_STARTUP_ADD_BUTTON));
   startup_remove_custom_page_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_STARTUP_REMOVE_BUTTON));
   startup_remove_custom_page_button_->SetEnabled(false);
   startup_use_current_page_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_STARTUP_USE_CURRENT));
 
   startup_custom_pages_table_model_.reset(
       new CustomHomePagesTableModel(profile()));
-  std::vector<views::TableColumn> columns;
-  columns.push_back(views::TableColumn());
+  std::vector<TableColumn> columns;
+  columns.push_back(TableColumn());
   startup_custom_pages_table_ = new views::TableView(
       startup_custom_pages_table_model_.get(), columns,
       views::ICON_AND_TEXT, true, false, true);
   // URLs are inherently left-to-right, so do not mirror the table.
   startup_custom_pages_table_->EnableUIMirroringForRTLLanguages(false);
   startup_custom_pages_table_->SetObserver(this);
 
   using views::GridLayout;
   using views::ColumnSet;
 
@@ skipping 272 matching lines @@
     homepage_use_url_textfield_->SetEnabled(false);
     homepage_use_url_textfield_->SetReadOnly(true);
   }
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }