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

chrome/browser/views/shelf_item_dialog.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 "chrome/browser/views/shelf_item_dialog.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "app/table_model.h"
+#include "app/table_model_observer.h"
 #include "base/gfx/png_decoder.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "views/background.h"
 #include "views/controls/label.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/controls/textfield/textfield.h"
 #include "views/focus/focus_manager.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 using base::Time;
 using base::TimeDelta;
 using views::ColumnSet;
 using views::GridLayout;
 
 // Preferred height of the table.
 static const int kTableWidth = 300;
 
 // The default favicon.
 static SkBitmap* default_fav_icon = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // A table model to represent the list of URLS that we the user might want to
 // bookmark.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // How long we query entry points for.
 static const int kPossibleURLTimeScope = 30;
 
-class PossibleURLModel : public views::TableModel {
+class PossibleURLModel : public TableModel {
  public:
   PossibleURLModel() : profile_(NULL) {
     if (!default_fav_icon) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       default_fav_icon = rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
 
   virtual ~PossibleURLModel() {
   }
@@ skipping 143 matching lines @@
         // The decoder will leave our bitmap empty on error.
         PNGDecoder::Decode(&data->data, &(fav_icon_map_[index]));
 
         // Notify the observer.
         if (!fav_icon_map_[index].isNull() && observer_)
           observer_->OnItemsChanged(static_cast<int>(index), 1);
       }
     }
   }
 
-  virtual void SetObserver(views::TableModelObserver* observer) {
+  virtual void SetObserver(TableModelObserver* observer) {
     observer_ = observer;
   }
 
  private:
   // Contains the data needed to show a result.
   struct Result {
     Result() : index(0) {}
 
     GURL url;
     // Index of this Result in results_. This is used as the key into
     // fav_icon_map_ to lookup the favicon for the url, as well as the index
     // into results_ when the favicon is received.
     size_t index;
     gfx::SortedDisplayURL display_url;
     std::wstring title;
   };
 
   // The current profile.
   Profile* profile_;
 
   // Our observer.
-  views::TableModelObserver* observer_;
+  TableModelObserver* observer_;
 
   // Our consumer for favicon requests.
   CancelableRequestConsumerT<size_t, NULL> consumer_;
 
   // The results we're showing.
   std::vector<Result> results_;
 
   // Map Result::index -> Favicon.
   typedef std::map<size_t, SkBitmap> FavIconMap;
   FavIconMap fav_icon_map_;
@@ skipping 11 matching lines @@
                                  bool show_title)
     : profile_(profile),
       expected_title_handle_(0),
       delegate_(delegate) {
   DCHECK(profile_);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   url_table_model_.reset(new PossibleURLModel());
 
-  views::TableColumn col1(IDS_ASI_PAGE_COLUMN, views::TableColumn::LEFT, -1,
+  TableColumn col1(IDS_ASI_PAGE_COLUMN, TableColumn::LEFT, -1,
                           50);
   col1.sortable = true;
-  views::TableColumn col2(IDS_ASI_URL_COLUMN, views::TableColumn::LEFT, -1,
+  TableColumn col2(IDS_ASI_URL_COLUMN, TableColumn::LEFT, -1,
                           50);
   col2.sortable = true;
-  std::vector<views::TableColumn> cols;
+  std::vector<TableColumn> cols;
   cols.push_back(col1);
   cols.push_back(col2);
 
   url_table_ = new views::TableView(url_table_model_.get(), cols,
                                     views::ICON_AND_TEXT, true, true,
                                     true);
   url_table_->SetObserver(this);
 
   // Yummy layout code.
   const int labels_column_set_id = 0;
@@ skipping 233 matching lines @@
     OnSelectionChanged();
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL ShelfItemDialog::GetInputURL() const {
   return GURL(URLFixerUpper::FixupURL(url_field_->text(), L""));
 }