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

4 files changed, 19 insertions, 11 deletions

diff --git a/views/examples/combobox_example.h b/views/examples/combobox_example.h
index 3aad6eb..35e85c0 100644
--- a/views/examples/combobox_example.h
+++ b/views/examples/combobox_example.h
@@ -6,13 +6,15 @@
 #define VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 #pragma once
 
-#include "app/combobox_model.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/examples/example_base.h"
 #include "views/fill_layout.h"
 
+using ui::ComboboxModel;  // TODO(beng): remove
+
 namespace examples {
 
 // ComboboxExample
diff --git a/views/examples/menu_example.h b/views/examples/menu_example.h
index 91c32a4..680e2bb 100644
--- a/views/examples/menu_example.h
+++ b/views/examples/menu_example.h
@@ -8,8 +8,8 @@
 
 #include <set>
 
-#include "app/menus/simple_menu_model.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -19,8 +19,8 @@
 
 namespace examples {
 
-class ExampleMenuContents : public menus::SimpleMenuModel,
-                            public menus::SimpleMenuModel::Delegate {
+class ExampleMenuContents : public ui::SimpleMenuModel,
+                            public ui::SimpleMenuModel::Delegate {
   enum {
     kGroupMakeDecision,
   };
@@ -38,7 +38,7 @@ class ExampleMenuContents : public menus::SimpleMenuModel,
 
  public:
   ExampleMenuContents() :
-      ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       current_encoding_command_id_(kCommandSelectAscii) {
 
     AddItem(kCommandDoSomething, WideToUTF16(L"Do Something"));
@@ -56,7 +56,7 @@ class ExampleMenuContents : public menus::SimpleMenuModel,
     AddSeparator();
     AddItem(kCommandGoHome, WideToUTF16(L"Go Home"));
 
-    submenu_.reset(new menus::SimpleMenuModel(this));
+    submenu_.reset(new ui::SimpleMenuModel(this));
     submenu_->AddItem(kCommandDoSomething, WideToUTF16(L"Do Something 2"));
     AddSubMenu(-1, ASCIIToUTF16("Submenu"), submenu_.get());
     menu_.reset(new views::Menu2(this));
@@ -66,7 +66,7 @@ class ExampleMenuContents : public menus::SimpleMenuModel,
     menu_->RunMenuAt(point, views::Menu2::ALIGN_TOPRIGHT);
   }
 
-  // menus::SimpleMenuModel::Delegate implementation.
+  // ui::SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const {
     // Radio items.
     if (command_id == current_encoding_command_id_) {
@@ -87,7 +87,7 @@ class ExampleMenuContents : public menus::SimpleMenuModel,
 
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      menus::Accelerator* accelerator) {
+      ui::Accelerator* accelerator) {
     // We don't use this in the example.
     return false;
   }
@@ -145,7 +145,7 @@ class ExampleMenuContents : public menus::SimpleMenuModel,
 
  private:
   scoped_ptr<views::Menu2> menu_;
-  scoped_ptr<menus::SimpleMenuModel> submenu_;
+  scoped_ptr<ui::SimpleMenuModel> submenu_;
   std::set<int> checked_fruits_;
   int current_encoding_command_id_;
 
diff --git a/views/examples/table2_example.h b/views/examples/table2_example.h
index a3504e1..c4c33b2 100644
--- a/views/examples/table2_example.h
+++ b/views/examples/table2_example.h
@@ -9,14 +9,17 @@
 #include <string>
 #include <vector>
 
-#include "app/table_model.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/controls/table/table_view2.h"
 #include "views/examples/example_base.h"
 
+using ui::TableModel;
+using ui::TableModelObserver;  // TODO(beng): remove these.
+
 namespace examples {
 
 class Table2Example
diff --git a/views/examples/table_example.h b/views/examples/table_example.h
index 8c2a36e..fdce299 100644
--- a/views/examples/table_example.h
+++ b/views/examples/table_example.h
@@ -8,14 +8,17 @@
 
 #include <vector>
 
-#include "app/table_model.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/examples/example_base.h"
 #include "views/fill_layout.h"
 
+using ui::TableModel;
+using ui::TableModelObserver; // TODO(beng): remove these
+
 namespace examples {
 
 class TableExample