Move TableModel out of views/ and into app/.

Remove stub implementation in temp_scaffolding_stubs.h

Use l10n_util collator helper function in TableModel::Compare
Review URL: http://codereview.chromium.org/126184

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

3 files changed, 8 insertions, 16 deletions

diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc
index 4ff6a57..733c99e 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -8,6 +8,7 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "app/table_model_observer.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -21,10 +22,6 @@
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "views/controls/table/table_model_observer.h"
-#endif
-
 namespace {
 
 // Number of bookmarks shown in recently bookmarked.
diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h
index db7051f..7dd7f9e 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.h
+++ b/chrome/browser/bookmarks/bookmark_table_model.h
@@ -5,21 +5,16 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_TABLE_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_TABLE_MODEL_H_
 
+#include "app/table_model.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
-#if defined(TOOLKIT_VIEWS)
-#include "views/controls/table/table_model.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 // BookmarkTableModel provides a view of the BookmarkModel as a TableModel.
 // Three variations are provided:
 // . Recently created bookmarks.
 // . The children of a particular folder.
 // . All bookmarks matching the specified text.
-class BookmarkTableModel : public views::TableModel,
+class BookmarkTableModel : public TableModel,
                            public BookmarkModelObserver {
  public:
   // Methods for creating the various BookmarkTableModels. Ownership passes
@@ -41,7 +36,7 @@ class BookmarkTableModel : public views::TableModel,
   // TableModel methods.
   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) {
     observer_ = observer;
   }
 
@@ -63,14 +58,14 @@ class BookmarkTableModel : public views::TableModel,
   BookmarkModel* model() const { return model_; }
 
  protected:
-  views::TableModelObserver* observer() const { return observer_; }
+  TableModelObserver* observer() const { return observer_; }
 
  private:
   // Builds the path shown in the path column for the specified node.
   void BuildPath(BookmarkNode* node, std::wstring* path);
 
   BookmarkModel* model_;
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkTableModel);
 };
diff --git a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
index 7add6a9..9003256 100644
--- a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
@@ -2,13 +2,13 @@
 // 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/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/controls/table/table_model_observer.h"
 
 using base::Time;
 using base::TimeDelta;
@@ -23,7 +23,7 @@ using base::TimeDelta;
 //   f2
 //   url3 (t0 + 1)
 class BookmarkTableModelTest : public testing::Test,
-                               public views::TableModelObserver {
+                               public TableModelObserver {
  public:
   BookmarkTableModelTest()
       : url1_("http://1"),