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

chrome/browser/views/options/languages_page_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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/languages_page_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "app/table_model.h"
+#include "app/table_model_observer.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/views/options/language_combobox_model.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "unicode/uloc.h"
 #include "views/controls/button/radio_button.h"
 #include "views/controls/tabbed_pane.h"
-#include "views/controls/table/table_model.h"
-#include "views/controls/table/table_model_observer.h"
 #include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 static const char* const accept_language_list[] = {
   "af",     // Afrikaans
   "am",     // Amharic
   "ar",     // Arabic
@@ skipping 260 matching lines @@
   }
   accept_language_combobox_model_.reset(new LanguageComboboxModel(
     profile_, locale_codes));
   accept_language_combobox_ = new views::Combobox(
       accept_language_combobox_model_.get());
   accept_language_combobox_->SetSelectedItem(0);
   accept_language_combobox_->set_listener(this);
   AddChildView(accept_language_combobox_);
 }
 
-class LanguageOrderTableModel : public views::TableModel {
+class LanguageOrderTableModel : public TableModel {
  public:
   LanguageOrderTableModel();
 
   // Set Language List.
   void SetAcceptLanguagesString(const std::string& language_list);
 
   // Add at the end.
   void Add(const std::string& language);
 
   // Removes the entry at the specified index.
   void Remove(int index);
 
   // Returns index corresponding to a given language. Returns -1 if the
   // language is not found.
   int GetIndex(const std::string& language);
 
   // Move down the entry at the specified index.
   void MoveDown(int index);
 
   // Move up the entry at the specified index.
   void MoveUp(int index);
 
   // Returns the set of languagess this model contains.
   std::string GetLanguageList() { return VectorToList(languages_); }
 
-  // views::TableModel overrides:
+  // TableModel overrides:
   virtual int RowCount();
   virtual std::wstring GetText(int row, int column_id);
-  virtual void SetObserver(views::TableModelObserver* observer);
+  virtual void SetObserver(TableModelObserver* observer);
 
  private:
   // This method converts a comma separated list to a vector of strings.
   void ListToVector(const std::string& list,
                     std::vector<std::string>* vector);
 
   // This method returns a comma separated string given a string vector.
   std::string VectorToList(const std::vector<std::string>& vector);
 
   // Set of entries we're showing.
   std::vector<std::string> languages_;
   std::string comma_separated_language_list_;
 
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageOrderTableModel);
 };
 
 LanguageOrderTableModel::LanguageOrderTableModel()
     : observer_(NULL) {
 }
 
 void LanguageOrderTableModel::SetAcceptLanguagesString(
     const std::string& language_list) {
   std::vector<std::string> languages_vector;
   ListToVector(language_list, &languages_vector);
   for (int i = 0; i < static_cast<int>(languages_vector.size()); i++) {
     Add(languages_vector.at(i));
   }
 }
 
-void LanguageOrderTableModel::SetObserver(
-    views::TableModelObserver* observer) {
+void LanguageOrderTableModel::SetObserver(TableModelObserver* observer) {
   observer_ = observer;
 }
 
 std::wstring LanguageOrderTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
   const std::wstring app_locale = g_browser_process->GetApplicationLocale();
   return l10n_util::GetLocalName(languages_.at(row), app_locale, true);
 }
 
 void LanguageOrderTableModel::Add(const std::string& language) {
@@ skipping 172 matching lines @@
       l10n_util::GetString(
           IDS_FONT_LANGUAGE_SETTING_LANGUAGES_INSTRUCTIONS));
   languages_instructions_->SetMultiLine(true);
   languages_instructions_->SetHorizontalAlignment(
       views::Label::ALIGN_LEFT);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(languages_instructions_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   // Add two columns - for table, and for button stack.
-  std::vector<views::TableColumn> columns;
-  columns.push_back(views::TableColumn());
+  std::vector<TableColumn> columns;
+  columns.push_back(TableColumn());
   language_order_table_model_.reset(new LanguageOrderTableModel);
   language_order_table_ = new views::TableView(
       language_order_table_model_.get(), columns,
       views::TEXT_ONLY, false, true, true);
   language_order_table_->SetObserver(this);
 
   const int double_column_view_set_id = 1;
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
@@ skipping 287 matching lines @@
   }
 
   if (enable_spellcheck_checkbox_clicked_)
     enable_spellcheck_.SetValue(enable_spellchecking_checkbox_->checked());
 
   if (enable_autospellcorrect_checkbox_clicked_) {
     enable_autospellcorrect_.SetValue(
         enable_autospellcorrect_checkbox_->checked());
   }
 }