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

chrome/browser/views/keyword_editor_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_
 
 #include <Windows.h>
 #include <map>
 
+#include "app/table_model.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "views/controls/button/button.h"
-#include "views/controls/table/table_model.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/view.h"
 #include "views/window/dialog_delegate.h"
 
 namespace views {
 class Label;
 class NativeButton;
 }
 
 namespace {
 class BorderView;
 }
 
 class ModelEntry;
 class SkBitmap;
 class TemplateURLModel;
 class TemplateURLTableModel;
 
 // TemplateURLTableModel is the TableModel implementation used by
 // KeywordEditorView to show the keywords in a TableView.
 //
 // TemplateURLTableModel has two columns, the first showing the description,
 // the second the keyword.
 //
 // TemplateURLTableModel maintains a vector of ModelEntrys that correspond to
 // each row in the tableview. Each ModelEntry wraps a TemplateURL, providing
 // the favicon. The entries in the model are sorted such that non-generated
 // appear first (grouped together) and are followed by generated keywords.
 
-class TemplateURLTableModel : public views::TableModel {
+class TemplateURLTableModel : public TableModel {
  public:
   explicit TemplateURLTableModel(TemplateURLModel* template_url_model);
 
   virtual ~TemplateURLTableModel();
 
   // Reloads the entries from the TemplateURLModel. This should ONLY be invoked
   // if the TemplateURLModel wasn't initially loaded and has been loaded.
   void Reload();
 
   // TableModel overrides.
   virtual int RowCount();
   virtual std::wstring GetText(int row, int column);
   virtual SkBitmap GetIcon(int row);
-  virtual void SetObserver(views::TableModelObserver* observer);
+  virtual void SetObserver(TableModelObserver* observer);
   virtual bool HasGroups();
   virtual Groups GetGroups();
   virtual int GetGroupID(int row);
 
   // Removes the entry at the specified index. This does NOT propagate the
   // change to the backend.
   void Remove(int index);
 
   // Adds a new entry at the specified index. This does not propagate the
   // change to the backend.
@@ skipping 21 matching lines @@
 
   // Returns the index of the last entry shown in the search engines group.
   int last_search_engine_index() const { return last_search_engine_index_; }
 
  private:
   friend class ModelEntry;
 
   // Notification that a model entry has fetched its icon.
   void FavIconAvailable(ModelEntry* entry);
 
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   // The entries.
   std::vector<ModelEntry*> entries_;
 
   // The model we're displaying entries from.
   TemplateURLModel* template_url_model_;
 
   // Index of the last search engine in entries_. This is used to determine the
   // group boundaries.
   int last_search_engine_index_;
@@ skipping 86 matching lines @@
   views::TableView* table_view_;
   views::NativeButton* add_button_;
   views::NativeButton* edit_button_;
   views::NativeButton* remove_button_;
   views::NativeButton* make_default_button_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordEditorView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_