Move models from app to ui/base/models

BUG=none
TEST=none
TBR=brettw


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/search_engines/keyword_editor_controller_unittest.cc
index 4952166..e59af22 100644
--- a/chrome/browser/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/search_engines/keyword_editor_controller_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/table_model_observer.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ -16,6 +15,7 @@
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/models/table_model_observer.h"
 
 static const string16 kA(ASCIIToUTF16("a"));
 static const string16 kA1(ASCIIToUTF16("a1"));
@@ -25,7 +25,7 @@ static const string16 kB1(ASCIIToUTF16("b1"));
 // Base class for keyword editor tests. Creates a profile containing an
 // empty TemplateURLModel.
 class KeywordEditorControllerTest : public testing::Test,
-                                    public TableModelObserver {
+                                    public ui::TableModelObserver {
  public:
   // Initializes all of the state.
   void Init(bool simulate_load_failure);
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc
index 12189f1..453b98d 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/search_engines/template_url_table_model.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/table_model_observer.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util-inl.h"
@@ -19,6 +18,7 @@
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/models/table_model_observer.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
@@ -211,7 +211,7 @@ SkBitmap TemplateURLTableModel::GetIcon(int row) {
   return entries_[row]->GetIcon();
 }
 
-void TemplateURLTableModel::SetObserver(TableModelObserver* observer) {
+void TemplateURLTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
diff --git a/chrome/browser/search_engines/template_url_table_model.h b/chrome/browser/search_engines/template_url_table_model.h
index 95ca739..7a0d42b 100644
--- a/chrome/browser/search_engines/template_url_table_model.h
+++ b/chrome/browser/search_engines/template_url_table_model.h
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-#include "app/table_model.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
+#include "ui/base/models/table_model.h"
 
 class ModelEntry;
 class SkBitmap;
@@ -30,7 +30,7 @@ class TemplateURLModel;
 // 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 TableModel,
+class TemplateURLTableModel : public ui::TableModel,
                                      TemplateURLModelObserver {
  public:
   explicit TemplateURLTableModel(TemplateURLModel* template_url_model);
@@ -41,11 +41,11 @@ class TemplateURLTableModel : public TableModel,
   // if the TemplateURLModel wasn't initially loaded and has been loaded.
   void Reload();
 
-  // TableModel overrides.
+  // ui::TableModel overrides.
   virtual int RowCount() OVERRIDE;
   virtual string16 GetText(int row, int column) OVERRIDE;
   virtual SkBitmap GetIcon(int row) OVERRIDE;
-  virtual void SetObserver(TableModelObserver* observer) OVERRIDE;
+  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
   virtual bool HasGroups() OVERRIDE;
   virtual Groups GetGroups() OVERRIDE;
   virtual int GetGroupID(int row) OVERRIDE;
@@ -98,7 +98,7 @@ class TemplateURLTableModel : public TableModel,
   // TemplateURLModelObserver notification.
   virtual void OnTemplateURLModelChanged();
 
-  TableModelObserver* observer_;
+  ui::TableModelObserver* observer_;
 
   // The entries.
   std::vector<ModelEntry*> entries_;