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

42 files changed, 189 insertions, 142 deletions

diff --git a/views/accelerator.h b/views/accelerator.h
index 81e3043..5b37198 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -14,18 +14,18 @@
 
 #include <string>
 
-#include "app/menus/accelerator.h"
 #include "base/string16.h"
+#include "ui/base/models/accelerator.h"
 #include "views/event.h"
 
 namespace views {
 
-class Accelerator : public menus::Accelerator {
+class Accelerator : public ui::Accelerator {
  public:
-  Accelerator() : menus::Accelerator() {}
+  Accelerator() : ui::Accelerator() {}
 
   Accelerator(ui::KeyboardCode keycode, int modifiers)
-      : menus::Accelerator(keycode, modifiers) {}
+      : ui::Accelerator(keycode, modifiers) {}
 
   Accelerator(ui::KeyboardCode keycode,
               bool shift_pressed, bool ctrl_pressed, bool alt_pressed) {
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index b1b691f..d8625d9 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -24,7 +24,7 @@ static const int kMenuTimerDelay = 500;
 ////////////////////////////////////////////////////////////////////////////////
 
 ButtonDropDown::ButtonDropDown(ButtonListener* listener,
-                               menus::MenuModel* model)
+                               ui::MenuModel* model)
     : ImageButton(listener),
       model_(model),
       y_position_on_lbuttondown_(0),
diff --git a/views/controls/button/button_dropdown.h b/views/controls/button/button_dropdown.h
index a244f253..e2c372e04 100644
--- a/views/controls/button/button_dropdown.h
+++ b/views/controls/button/button_dropdown.h
@@ -22,7 +22,7 @@ namespace views {
 ////////////////////////////////////////////////////////////////////////////////
 class ButtonDropDown : public ImageButton {
  public:
-  ButtonDropDown(ButtonListener* listener, menus::MenuModel* model);
+  ButtonDropDown(ButtonListener* listener, ui::MenuModel* model);
   virtual ~ButtonDropDown();
 
   // Accessibility accessors, overridden from View.
@@ -53,7 +53,7 @@ class ButtonDropDown : public ImageButton {
   void ShowDropDownMenu(gfx::NativeView window);
 
   // The model that populates the attached menu.
-  menus::MenuModel* model_;
+  ui::MenuModel* model_;
   scoped_ptr<Menu2> menu_;
 
   // Y position of mouse when left mouse button is pressed
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index 49dd4d3..6eb32ba 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -4,13 +4,15 @@
 
 #include "views/controls/combobox/combobox.h"
 
-#include "app/combobox_model.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/native_combobox_wrapper.h"
 #include "views/controls/native/native_view_host.h"
 
+using ui::ComboboxModel;  // TODO(beng): remove
+
 namespace views {
 
 // static
diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index 2068932..d306761 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -10,7 +10,10 @@
 
 #include "views/view.h"
 
+namespace ui {
 class ComboboxModel;
+}
+using ui::ComboboxModel;
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index 59eed68..e596328 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -8,10 +8,12 @@
 
 #include <algorithm>
 
-#include "app/combobox_model.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/combobox.h"
 
+using ui::ComboboxModel;  // TODO(beng): remove
+
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 2134a75e..94c431d 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -4,15 +4,17 @@
 
 #include "views/controls/combobox/native_combobox_win.h"
 
-#include "app/combobox_model.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
+#include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
+using ui::ComboboxModel;  // TODO(beng): remove
+
 namespace views {
 
 // Limit how small a combobox can be.
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc
index 037d5de..f64f275 100644
--- a/views/controls/menu/menu_2.cc
+++ b/views/controls/menu/menu_2.cc
@@ -9,7 +9,7 @@
 
 namespace views {
 
-Menu2::Menu2(menus::MenuModel* model)
+Menu2::Menu2(ui::MenuModel* model)
     : model_(model),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           wrapper_(MenuWrapper::CreateWrapper(this))) {
diff --git a/views/controls/menu/menu_2.h b/views/controls/menu/menu_2.h
index 2d0ff23..8916b7c 100644
--- a/views/controls/menu/menu_2.h
+++ b/views/controls/menu/menu_2.h
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_MENU_MENU_2_H_
 #pragma once
 
-#include "app/menus/menu_model.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/models/menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace gfx {
@@ -32,7 +32,7 @@ class Menu2 {
   // from the constructor. EG:
   //   MyClass : menu_(this) {}
   // is likely to have problems.
-  explicit Menu2(menus::MenuModel* model);
+  explicit Menu2(ui::MenuModel* model);
   virtual ~Menu2() {}
 
   // How the menu is aligned relative to the point it is shown at.
@@ -74,7 +74,7 @@ class Menu2 {
   void RemoveMenuListener(MenuListener* listener);
 
   // Accessors.
-  menus::MenuModel* model() const { return model_; }
+  ui::MenuModel* model() const { return model_; }
 
   // Sets the minimum width of the menu.
   void SetMinimumWidth(int width);
@@ -82,7 +82,7 @@ class Menu2 {
  private:
   friend class NativeMenuGtk;
 
-  menus::MenuModel* model_;
+  ui::MenuModel* model_;
 
   // The object that actually implements the menu.
   scoped_ptr<MenuWrapper> wrapper_;
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index ec9b944..d24ef81 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -27,7 +27,7 @@ class MenuButton;
 
 // Delegate for a menu. This class is used as part of MenuItemView, see it
 // for details.
-// TODO(sky): merge this with menus::MenuModel.
+// TODO(sky): merge this with ui::MenuModel.
 class MenuDelegate : Controller {
  public:
   // Used during drag and drop to indicate where the drop indicator should
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 8d2b84d..ee60c79 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -5,10 +5,10 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "app/l10n_util.h"
-#include "app/menus/menu_model.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
+#include "ui/base/models/menu_model.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_config.h"
@@ -239,31 +239,31 @@ void MenuItemView::Cancel() {
   }
 }
 
-MenuItemView* MenuItemView::AppendMenuItemFromModel(menus::MenuModel* model,
+MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model,
                                                     int index,
                                                     int id) {
   SkBitmap icon;
   std::wstring label;
   MenuItemView::Type type;
-  menus::MenuModel::ItemType menu_type = model->GetTypeAt(index);
+  ui::MenuModel::ItemType menu_type = model->GetTypeAt(index);
   switch (menu_type) {
-    case menus::MenuModel::TYPE_COMMAND:
+    case ui::MenuModel::TYPE_COMMAND:
       model->GetIconAt(index, &icon);
       type = MenuItemView::NORMAL;
       label = UTF16ToWide(model->GetLabelAt(index));
       break;
-    case menus::MenuModel::TYPE_CHECK:
+    case ui::MenuModel::TYPE_CHECK:
       type = MenuItemView::CHECKBOX;
       label = UTF16ToWide(model->GetLabelAt(index));
       break;
-    case menus::MenuModel::TYPE_RADIO:
+    case ui::MenuModel::TYPE_RADIO:
       type = MenuItemView::RADIO;
       label = UTF16ToWide(model->GetLabelAt(index));
       break;
-    case menus::MenuModel::TYPE_SEPARATOR:
+    case ui::MenuModel::TYPE_SEPARATOR:
       type = MenuItemView::SEPARATOR;
       break;
-    case menus::MenuModel::TYPE_SUBMENU:
+    case ui::MenuModel::TYPE_SUBMENU:
       type = MenuItemView::SUBMENU;
       label = UTF16ToWide(model->GetLabelAt(index));
       break;
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 83e5102..23036a4 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -21,7 +21,7 @@
 #include "gfx/native_theme_win.h"
 #endif
 
-namespace menus {
+namespace ui {
 class MenuModel;
 }
 
@@ -184,7 +184,7 @@ class MenuItemView : public View {
   // Creates a menu item for the specified entry in the model and appends it as
   // a child. |index| should be offset by GetFirstItemIndex() before calling
   // this function.
-  MenuItemView* AppendMenuItemFromModel(menus::MenuModel* model,
+  MenuItemView* AppendMenuItemFromModel(ui::MenuModel* model,
                                         int index,
                                         int id);
 
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 3aecff8..57033d4 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -8,7 +8,6 @@
 #include <map>
 #include <string>
 
-#include "app/menus/menu_model.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/time.h"
@@ -18,6 +17,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
+#include "ui/base/models/menu_model.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/nested_dispatcher_gtk.h"
@@ -44,10 +44,10 @@ struct Position {
 };
 
 // Returns true if the menu item type specified can be executed as a command.
-bool MenuTypeCanExecute(menus::MenuModel::ItemType type) {
-  return type == menus::MenuModel::TYPE_COMMAND ||
-      type == menus::MenuModel::TYPE_CHECK ||
-      type == menus::MenuModel::TYPE_RADIO;
+bool MenuTypeCanExecute(ui::MenuModel::ItemType type) {
+  return type == ui::MenuModel::TYPE_COMMAND ||
+      type == ui::MenuModel::TYPE_CHECK ||
+      type == ui::MenuModel::TYPE_RADIO;
 }
 
 // A callback to gtk_container_foreach to remove all children.
@@ -174,10 +174,10 @@ void NativeMenuGtk::Rebuild() {
 
   std::map<int, GtkRadioMenuItem*> radio_groups_;
   for (int i = 0; i < model_->GetItemCount(); ++i) {
-    menus::MenuModel::ItemType type = model_->GetTypeAt(i);
-    if (type == menus::MenuModel::TYPE_SEPARATOR) {
+    ui::MenuModel::ItemType type = model_->GetTypeAt(i);
+    if (type == ui::MenuModel::TYPE_SEPARATOR) {
       AddSeparatorAt(i);
-    } else if (type == menus::MenuModel::TYPE_RADIO) {
+    } else if (type == ui::MenuModel::TYPE_RADIO) {
       const int radio_group_id = model_->GetGroupIdAt(i);
       std::map<int, GtkRadioMenuItem*>::const_iterator iter
           = radio_groups_.find(radio_group_id);
@@ -329,12 +329,12 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
   std::string label = gfx::ConvertAcceleratorsFromWindowsStyle(UTF16ToUTF8(
       model_->GetLabelAt(index)));
 
-  menus::MenuModel::ItemType type = model_->GetTypeAt(index);
+  ui::MenuModel::ItemType type = model_->GetTypeAt(index);
   switch (type) {
-    case menus::MenuModel::TYPE_CHECK:
+    case ui::MenuModel::TYPE_CHECK:
       menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
       break;
-    case menus::MenuModel::TYPE_RADIO:
+    case ui::MenuModel::TYPE_RADIO:
       if (radio_group) {
         menu_item = gtk_radio_menu_item_new_with_mnemonic_from_widget(
             radio_group, label.c_str());
@@ -343,8 +343,8 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
         menu_item = gtk_radio_menu_item_new_with_mnemonic(NULL, label.c_str());
       }
       break;
-    case menus::MenuModel::TYPE_SUBMENU:
-    case menus::MenuModel::TYPE_COMMAND: {
+    case ui::MenuModel::TYPE_SUBMENU:
+    case ui::MenuModel::TYPE_COMMAND: {
       SkBitmap icon;
       // Create menu item with icon if icon exists.
       if (model_->HasIcons() && model_->GetIconAt(index, &icon)) {
@@ -380,7 +380,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
     pango_font_description_free(pfd);
   }
 
-  if (type == menus::MenuModel::TYPE_SUBMENU) {
+  if (type == ui::MenuModel::TYPE_SUBMENU) {
     Menu2* submenu = new Menu2(model_->GetSubmenuModelAt(index));
     static_cast<NativeMenuGtk*>(submenu->wrapper_.get())->set_parent(this);
     g_object_set_data(G_OBJECT(menu_item), "submenu", submenu);
diff --git a/views/controls/menu/native_menu_gtk.h b/views/controls/menu/native_menu_gtk.h
index f15bc19..58a6993 100644
--- a/views/controls/menu/native_menu_gtk.h
+++ b/views/controls/menu/native_menu_gtk.h
@@ -15,7 +15,7 @@
 #include "base/task.h"
 #include "views/controls/menu/menu_wrapper.h"
 
-namespace menus {
+namespace ui {
 class MenuModel;
 }
 
@@ -101,7 +101,7 @@ class NativeMenuGtk : public MenuWrapper,
   // If we're a submenu, this is the parent.
   NativeMenuGtk* parent_;
 
-  menus::MenuModel* model_;
+  ui::MenuModel* model_;
 
   GtkWidget* menu_;
 
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index efdaa67..687e932 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -121,7 +121,7 @@ class NativeMenuWin::MenuHostWindow {
   // Called when the user selects a specific item.
   void OnMenuCommand(int position, HMENU menu) {
     NativeMenuWin* intergoat = GetNativeMenuWinFromHMENU(menu);
-    menus::MenuModel* model = intergoat->model_;
+    ui::MenuModel* model = intergoat->model_;
     model->ActivatedAt(position);
   }
 
@@ -297,7 +297,7 @@ const wchar_t* NativeMenuWin::MenuHostWindow::kWindowClassName =
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, public:
 
-NativeMenuWin::NativeMenuWin(menus::MenuModel* model, HWND system_menu_for)
+NativeMenuWin::NativeMenuWin(ui::MenuModel* model, HWND system_menu_for)
     : model_(model),
       menu_(NULL),
       owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL) &&
@@ -357,7 +357,7 @@ void NativeMenuWin::Rebuild() {
   for (int menu_index = first_item_index_;
         menu_index < first_item_index_ + model_->GetItemCount(); ++menu_index) {
     int model_index = menu_index - first_item_index_;
-    if (model_->GetTypeAt(model_index) == menus::MenuModel::TYPE_SEPARATOR)
+    if (model_->GetTypeAt(model_index) == ui::MenuModel::TYPE_SEPARATOR)
       AddSeparatorItemAt(menu_index, model_index);
     else
       AddMenuItemAt(menu_index, model_index);
@@ -486,13 +486,13 @@ void NativeMenuWin::AddMenuItemAt(int menu_index, int model_index) {
 
   ItemData* item_data = new ItemData;
   item_data->label = std::wstring();
-  menus::MenuModel::ItemType type = model_->GetTypeAt(model_index);
-  if (type == menus::MenuModel::TYPE_SUBMENU) {
+  ui::MenuModel::ItemType type = model_->GetTypeAt(model_index);
+  if (type == ui::MenuModel::TYPE_SUBMENU) {
     item_data->submenu.reset(new Menu2(model_->GetSubmenuModelAt(model_index)));
     mii.fMask |= MIIM_SUBMENU;
     mii.hSubMenu = item_data->submenu->GetNativeMenu();
   } else {
-    if (type == menus::MenuModel::TYPE_RADIO)
+    if (type == ui::MenuModel::TYPE_RADIO)
       mii.fType |= MFT_RADIOCHECK;
     mii.wID = model_->GetCommandIdAt(model_index);
   }
@@ -551,8 +551,8 @@ void NativeMenuWin::UpdateMenuItemInfoForString(
     int model_index,
     const std::wstring& label) {
   std::wstring formatted = label;
-  menus::MenuModel::ItemType type = model_->GetTypeAt(model_index);
-  if (type != menus::MenuModel::TYPE_SUBMENU) {
+  ui::MenuModel::ItemType type = model_->GetTypeAt(model_index);
+  if (type != ui::MenuModel::TYPE_SUBMENU) {
     // Add accelerator details to the label if provided.
     views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
     if (model_->GetAcceleratorAt(model_index, &accelerator)) {
@@ -612,7 +612,7 @@ void NativeMenuWin::CreateHostWindow() {
 ////////////////////////////////////////////////////////////////////////////////
 // SystemMenuModel:
 
-SystemMenuModel::SystemMenuModel(menus::SimpleMenuModel::Delegate* delegate)
+SystemMenuModel::SystemMenuModel(ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
 }
 
diff --git a/views/controls/menu/native_menu_win.h b/views/controls/menu/native_menu_win.h
index e364bcc..eb28bbe 100644
--- a/views/controls/menu/native_menu_win.h
+++ b/views/controls/menu/native_menu_win.h
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "app/menus/simple_menu_model.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
@@ -21,7 +21,7 @@ class NativeMenuWin : public MenuWrapper {
   // Construct a NativeMenuWin, with a model and delegate. If |system_menu_for|
   // is non-NULL, the NativeMenuWin wraps the system menu for that window.
   // The caller owns the model and the delegate.
-  NativeMenuWin(menus::MenuModel* model, HWND system_menu_for);
+  NativeMenuWin(ui::MenuModel* model, HWND system_menu_for);
   virtual ~NativeMenuWin();
 
   // Overridden from MenuWrapper:
@@ -100,7 +100,7 @@ class NativeMenuWin : public MenuWrapper {
       int n_code, WPARAM w_param, LPARAM l_param);
 
   // Our attached model and delegate.
-  menus::MenuModel* model_;
+  ui::MenuModel* model_;
 
   HMENU menu_;
 
@@ -145,12 +145,12 @@ class NativeMenuWin : public MenuWrapper {
 
 // A SimpleMenuModel subclass that allows the system menu for a window to be
 // wrapped.
-class SystemMenuModel : public menus::SimpleMenuModel {
+class SystemMenuModel : public ui::SimpleMenuModel {
  public:
   explicit SystemMenuModel(Delegate* delegate);
   virtual ~SystemMenuModel();
 
-  // Overridden from menus::MenuModel:
+  // Overridden from ui::MenuModel:
   virtual int GetFirstItemIndex(gfx::NativeMenu native_menu) const;
 
  protected:
diff --git a/views/controls/menu/native_menu_x.cc b/views/controls/menu/native_menu_x.cc
index 45f9446..a952ea2 100644
--- a/views/controls/menu/native_menu_x.cc
+++ b/views/controls/menu/native_menu_x.cc
@@ -71,35 +71,35 @@ void NativeMenuX::SetMinimumWidth(int width) {
 
 bool NativeMenuX::IsItemChecked(int cmd) const {
   int index;
-  menus::MenuModel* model = model_;
-  if (!menus::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
+  ui::MenuModel* model = model_;
+  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
     return false;
   return model->IsItemCheckedAt(index);
 }
 
 bool NativeMenuX::IsCommandEnabled(int cmd) const {
   int index;
-  menus::MenuModel* model = model_;
-  if (!menus::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
+  ui::MenuModel* model = model_;
+  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
     return false;
   return model->IsEnabledAt(index);
 }
 
 void NativeMenuX::ExecuteCommand(int cmd) {
   int index;
-  menus::MenuModel* model = model_;
-  if (!menus::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
+  ui::MenuModel* model = model_;
+  if (!ui::MenuModel::GetModelAndIndexForCommandId(cmd, &model, &index))
     return;
   model->ActivatedAt(index);
 }
 
 bool NativeMenuX::GetAccelerator(int id, views::Accelerator* accelerator) {
   int index;
-  menus::MenuModel* model = model_;
-  if (!menus::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
+  ui::MenuModel* model = model_;
+  if (!ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
     return false;
 
-  menus::Accelerator menu_accelerator;
+  ui::Accelerator menu_accelerator;
   if (!model->GetAcceleratorAt(index, &menu_accelerator))
     return false;
 
@@ -110,7 +110,7 @@ bool NativeMenuX::GetAccelerator(int id, views::Accelerator* accelerator) {
 
 // private
 void NativeMenuX::AddMenuItemsFromModel(MenuItemView* parent,
-                                        menus::MenuModel* model) {
+                                        ui::MenuModel* model) {
   for (int i = 0; i < model->GetItemCount(); ++i) {
     int index = i + model->GetFirstItemIndex(NULL);
     MenuItemView* child = parent->AppendMenuItemFromModel(model, index,
@@ -123,10 +123,10 @@ void NativeMenuX::AddMenuItemsFromModel(MenuItemView* parent,
 }
 
 void NativeMenuX::UpdateMenuFromModel(SubmenuView* menu,
-                                      menus::MenuModel* model) {
+                                      ui::MenuModel* model) {
   for (int i = 0, sep = 0; i < model->GetItemCount(); ++i) {
     int index = i + model->GetFirstItemIndex(NULL);
-    if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SEPARATOR) {
+    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SEPARATOR) {
       ++sep;
       continue;
     }
@@ -147,7 +147,7 @@ void NativeMenuX::UpdateMenuFromModel(SubmenuView* menu,
       mitem->SetIcon(icon);
     }
 
-    if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SUBMENU) {
+    if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) {
       DCHECK(mitem->HasSubmenu());
       UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index));
     }
diff --git a/views/controls/menu/native_menu_x.h b/views/controls/menu/native_menu_x.h
index b13f33e..2621fb3 100644
--- a/views/controls/menu/native_menu_x.h
+++ b/views/controls/menu/native_menu_x.h
@@ -10,7 +10,7 @@
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_wrapper.h"
 
-namespace menus {
+namespace ui {
 class MenuModel;
 }
 
@@ -41,11 +41,11 @@ class NativeMenuX : public MenuWrapper,
   virtual bool GetAccelerator(int id, views::Accelerator* accelerator);
 
  private:
-  void AddMenuItemsFromModel(MenuItemView* parent, menus::MenuModel* model);
-  void UpdateMenuFromModel(SubmenuView* menu, menus::MenuModel* model);
+  void AddMenuItemsFromModel(MenuItemView* parent, ui::MenuModel* model);
+  void UpdateMenuFromModel(SubmenuView* menu, ui::MenuModel* model);
 
   // The attached model and delegate. Does not assume ownership.
-  menus::MenuModel* model_;
+  ui::MenuModel* model_;
   scoped_ptr<MenuItemView> root_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeMenuX);
diff --git a/views/controls/table/group_table_view.h b/views/controls/table/group_table_view.h
index 8ce6270..cbf0822 100644
--- a/views/controls/table/group_table_view.h
+++ b/views/controls/table/group_table_view.h
@@ -6,8 +6,8 @@
 #define VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #pragma once
 
-#include "app/table_model.h"
 #include "base/task.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/table/table_view.h"
 
 // The GroupTableView adds grouping to the TableView class.
diff --git a/views/controls/table/native_table_gtk.h b/views/controls/table/native_table_gtk.h
index 8e51d01..e9bf008 100644
--- a/views/controls/table/native_table_gtk.h
+++ b/views/controls/table/native_table_gtk.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "app/gtk_signal.h"
-#include "app/table_model.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/native_control_gtk.h"
 #include "views/controls/table/native_table_wrapper.h"
 
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index d660dbb..8acf41d 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -9,17 +9,19 @@
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
-#include "app/table_model.h"
 #include "app/win/hwnd_util.h"
 #include "base/logging.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/table/table_view2.h"
 #include "views/controls/table/table_view_observer.h"
 #include "views/widget/widget.h"
 
+using ui::TableColumn;
+
 namespace views {
 
 // Added to column width to prevent truncation.
diff --git a/views/controls/table/native_table_win.h b/views/controls/table/native_table_win.h
index 548f070..4151c2e 100644
--- a/views/controls/table/native_table_win.h
+++ b/views/controls/table/native_table_win.h
@@ -8,12 +8,14 @@
 
 #include <windows.h>
 
-#include "app/table_model.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/native_control_win.h"
 #include "views/controls/table/native_table_wrapper.h"
 
 typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW;
 
+using ui::TableColumn;
+
 namespace views {
 
 class TableView2;
diff --git a/views/controls/table/native_table_wrapper.h b/views/controls/table/native_table_wrapper.h
index 8e9067cb..c81d32d6 100644
--- a/views/controls/table/native_table_wrapper.h
+++ b/views/controls/table/native_table_wrapper.h
@@ -8,6 +8,8 @@
 
 #include "gfx/native_widget_types.h"
 
+using ui::TableColumn;
+
 namespace views {
 
 class TableView2;
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 45b0bf1..fc10f68 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -12,7 +12,6 @@
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
-#include "app/table_model.h"
 #include "app/win/hwnd_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
@@ -23,9 +22,12 @@
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
 
+using ui::TableColumn;
+
 namespace {
 
 int GetViewIndexFromPoint(HWND window, const gfx::Point& p) {
diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h
index cae1a64b..0d56302 100644
--- a/views/controls/table/table_view.h
+++ b/views/controls/table/table_view.h
@@ -16,23 +16,29 @@ typedef struct tagNMLVCUSTOMDRAW NMLVCUSTOMDRAW;
 #include <map>
 #include <vector>
 
-#include "app/table_model_observer.h"
 #include "base/gtest_prod_util.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/table_model_observer.h"
 
 #if defined(OS_WIN)
 // TODO(port): remove the ifdef when native_control.h is ported.
 #include "views/controls/native_control.h"
 #endif  // defined(OS_WIN)
 
-namespace gfx {
-class Font;
-}
+class SkBitmap;
 
+namespace ui {
 struct TableColumn;
 class TableModel;
-class SkBitmap;
+}
+using ui::TableColumn;
+using ui::TableModel;
+using ui::TableModelObserver; // TODO(beng): remove these.
+
+namespace gfx {
+class Font;
+}
 
 // A TableView is a view that displays multiple rows with any number of columns.
 // TableView is driven by a TableModel. The model returns the contents
diff --git a/views/controls/table/table_view2.cc b/views/controls/table/table_view2.cc
index 0f33b94..444dd9b 100644
--- a/views/controls/table/table_view2.cc
+++ b/views/controls/table/table_view2.cc
@@ -5,11 +5,13 @@
 
 #include "views/controls/table/table_view2.h"
 
-#include "app/table_model.h"
 #include "base/logging.h"
+#include "ui/base/models/table_model.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/table/table_view_observer.h"
 
+using ui::TableColumn;
+
 namespace views {
 
 // TableView2 ------------------------------------------------------------------
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index 102eece..9d76bb2 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -11,17 +11,23 @@
 #include <map>
 #include <vector>
 
-#include "app/table_model_observer.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/native_table_wrapper.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/models/table_model_observer.h"
 
+class SkBitmap;
+
+namespace ui {
 struct TableColumn;
 class TableModel;
-class SkBitmap;
+}
+using ui::TableColumn;
+using ui::TableModel;
+using ui::TableModelObserver; // TODO(beng): remove these.
 
 // A TableView2 is a view that displays multiple rows with any number of
 // columns.
diff --git a/views/controls/table/table_view_unittest.cc b/views/controls/table/table_view_unittest.cc
index bc51c4a..8ed5457 100644
--- a/views/controls/table/table_view_unittest.cc
+++ b/views/controls/table/table_view_unittest.cc
@@ -4,13 +4,13 @@
 
 #include <vector>
 
-#include "app/table_model.h"
-#include "app/table_model_observer.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/models/table_model.h"
+#include "ui/base/models/table_model_observer.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view2.h"
 #include "views/window/window_delegate.h"
@@ -20,6 +20,9 @@
 #include "views/window/window_gtk.h"
 #endif
 
+using ui::TableModel;
+using ui::TableModelObserver; // TODO(beng): remove these
+
 // Put the tests in the views namespace to make it easier to declare them as
 // friend classes.
 namespace views {
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index e719f1f..63e3082 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -323,7 +323,7 @@ void NativeTextfieldWin::HandleWillLoseFocus() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldWin, menus::SimpleMenuModel::Delegate implementation:
+// NativeTextfieldWin, ui::SimpleMenuModel::Delegate implementation:
 
 bool NativeTextfieldWin::IsCommandIdChecked(int command_id) const {
   return false;
@@ -343,7 +343,7 @@ bool NativeTextfieldWin::IsCommandIdEnabled(int command_id) const {
 }
 
 bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
-    menus::Accelerator* accelerator) {
+    ui::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
   // anywhere so we need to check for them explicitly here.
   switch (command_id) {
@@ -1100,7 +1100,7 @@ ITextDocument* NativeTextfieldWin::GetTextObjectModel() const {
 void NativeTextfieldWin::BuildContextMenu() {
   if (context_menu_contents_.get())
     return;
-  context_menu_contents_.reset(new menus::SimpleMenuModel(this));
+  context_menu_contents_.reset(new ui::SimpleMenuModel(this));
   context_menu_contents_->AddItemWithStringId(IDS_APP_UNDO, IDS_APP_UNDO);
   context_menu_contents_->AddSeparator();
   context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index bfe0c8e..06a2e35 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -15,9 +15,9 @@
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
-#include "app/menus/simple_menu_model.h"
 #include "base/win/scoped_comptr.h"
 #include "gfx/insets.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 
 namespace views {
@@ -35,7 +35,7 @@ class NativeTextfieldWin
                          CWinTraits<kDefaultEditStyle> >,
       public CRichEditCommands<NativeTextfieldWin>,
       public NativeTextfieldWrapper,
-      public menus::SimpleMenuModel::Delegate {
+      public ui::SimpleMenuModel::Delegate {
  public:
   DECLARE_WND_CLASS(L"ViewsTextfieldEdit");
 
@@ -72,11 +72,11 @@ class NativeTextfieldWin
   virtual void HandleDidGainFocus();
   virtual void HandleWillLoseFocus();
 
-  // Overridden from menus::SimpleMenuModel::Delegate:
+  // Overridden from ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
-                                          menus::Accelerator* accelerator);
+                                          ui::Accelerator* accelerator);
   virtual void ExecuteCommand(int command_id);
 
   // Update accessibility information.
@@ -234,7 +234,7 @@ class NativeTextfieldWin
   static bool did_load_library_;
 
   // The contents of the context menu for the edit.
-  scoped_ptr<menus::SimpleMenuModel> context_menu_contents_;
+  scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<Menu2> context_menu_;
 
   // Border insets.
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index b45ff45..9d4724d 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -24,6 +24,9 @@
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
+using ui::TreeModel;
+using ui::TreeModelNode;
+
 namespace views {
 
 TreeView::TreeView()
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 463a8bc..d4d0771 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -11,9 +11,9 @@
 
 #include <map>
 
-#include "app/tree_model.h"
 #include "base/basictypes.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/tree_model.h"
 #include "views/controls/native_control.h"
 
 namespace views {
@@ -31,7 +31,7 @@ class TreeViewController {
 
   // Returns true if the node can be edited. This is only used if the
   // TreeView is editable.
-  virtual bool CanEdit(TreeView* tree_view, TreeModelNode* node) {
+  virtual bool CanEdit(TreeView* tree_view, ui::TreeModelNode* node) {
     return true;
   }
 
@@ -44,7 +44,7 @@ class TreeViewController {
 // TreeView displays hierarchical data as returned from a TreeModel. The user
 // can expand, collapse and edit the items. A Controller may be attached to
 // receive notification of selection changes and restrict editing.
-class TreeView : public NativeControl, TreeModelObserver {
+class TreeView : public NativeControl, ui::TreeModelObserver {
  public:
   TreeView();
   virtual ~TreeView();
@@ -54,8 +54,8 @@ class TreeView : public NativeControl, TreeModelObserver {
   bool drag_enabled() const { return drag_enabled_; }
 
   // Sets the model. TreeView does not take ownership of the model.
-  void SetModel(TreeModel* model);
-  TreeModel* model() const { return model_; }
+  void SetModel(ui::TreeModel* model);
+  ui::TreeModel* model() const { return model_; }
 
   // Sets whether to automatically expand children when a parent node is
   // expanded. The default is false. If true, when a node in the tree is
@@ -84,7 +84,7 @@ class TreeView : public NativeControl, TreeModelObserver {
 
   // Edits the specified node. This cancels the current edit and expands
   // all parents of node.
-  void StartEditing(TreeModelNode* node);
+  void StartEditing(ui::TreeModelNode* node);
 
   // Cancels the current edit. Does nothing if not editing.
   void CancelEdit();
@@ -94,26 +94,26 @@ class TreeView : public NativeControl, TreeModelObserver {
 
   // If the user is editing a node, it is returned. If the user is not
   // editing a node, NULL is returned.
-  TreeModelNode* GetEditingNode();
+  ui::TreeModelNode* GetEditingNode();
 
   // Selects the specified node. This expands all the parents of node.
-  void SetSelectedNode(TreeModelNode* node);
+  void SetSelectedNode(ui::TreeModelNode* node);
 
   // Returns the selected node, or NULL if nothing is selected.
-  TreeModelNode* GetSelectedNode();
+  ui::TreeModelNode* GetSelectedNode();
 
   // Make sure node and all its parents are expanded.
-  void Expand(TreeModelNode* node);
+  void Expand(ui::TreeModelNode* node);
 
   // Convenience to expand ALL nodes in the tree.
   void ExpandAll();
 
   // Invoked from ExpandAll(). Expands the supplied node and recursively
   // invokes itself with all children.
-  void ExpandAll(TreeModelNode* node);
+  void ExpandAll(ui::TreeModelNode* node);
 
   // Returns true if the specified node is expanded.
-  bool IsExpanded(TreeModelNode* node);
+  bool IsExpanded(ui::TreeModelNode* node);
 
   // Sets whether the root is shown. If true, the root node of the tree is
   // shown, if false only the children of the root are shown. The default is
@@ -123,15 +123,15 @@ class TreeView : public NativeControl, TreeModelObserver {
   // Begin TreeModelObserver implementation.
   // Don't call these directly, instead your model
   // should notify the observer TreeView adds to it.
-  virtual void TreeNodesAdded(TreeModel* model,
-                              TreeModelNode* parent,
+  virtual void TreeNodesAdded(ui::TreeModel* model,
+                              ui::TreeModelNode* parent,
                               int start,
                               int count);
-  virtual void TreeNodesRemoved(TreeModel* model,
-                                TreeModelNode* parent,
+  virtual void TreeNodesRemoved(ui::TreeModel* model,
+                                ui::TreeModelNode* parent,
                                 int start,
                                 int count);
-  virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node);
+  virtual void TreeNodeChanged(ui::TreeModel* model, ui::TreeModelNode* node);
   // End TreeModelObserver implementation.
 
   // Sets the controller, which may be null. TreeView does not take ownership
@@ -186,10 +186,10 @@ class TreeView : public NativeControl, TreeModelObserver {
   virtual void OnContextMenu(const POINT& location);
 
   // Returns the TreeModelNode for |tree_item|.
-  TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item);
+  ui::TreeModelNode* GetNodeForTreeItem(HTREEITEM tree_item);
 
   // Returns the tree item for |node|.
-  HTREEITEM GetTreeItemForNode(TreeModelNode* node);
+  HTREEITEM GetTreeItemForNode(ui::TreeModelNode* node);
 
  private:
   // See notes in TableView::TableViewWrapper for why this is needed.
@@ -201,7 +201,7 @@ class TreeView : public NativeControl, TreeModelObserver {
   // Internally used to track the state of nodes. NodeDetails are lazily created
   // as the user expands nodes.
   struct NodeDetails {
-    NodeDetails(int id, TreeModelNode* node)
+    NodeDetails(int id, ui::TreeModelNode* node)
         : id(id), node(node), tree_item(NULL), loaded_children(false) {}
 
     // Unique identifier for the node. This corresponds to the lParam of
@@ -209,7 +209,7 @@ class TreeView : public NativeControl, TreeModelObserver {
     const int id;
 
     // The node from the model.
-    TreeModelNode* node;
+    ui::TreeModelNode* node;
 
     // From the native TreeView.
     //
@@ -233,7 +233,8 @@ class TreeView : public NativeControl, TreeModelObserver {
   // parent and is null for root items. after dictates where among the
   // children of parent_item the item is to be created. node is the node from
   // the model.
-  void CreateItem(HTREEITEM parent_item, HTREEITEM after, TreeModelNode* node);
+  void CreateItem(HTREEITEM parent_item, HTREEITEM after,
+                  ui::TreeModelNode* node);
 
   // Removes entries from the map for item. This method will also
   // remove the items from the TreeView because the process of
@@ -242,7 +243,7 @@ class TreeView : public NativeControl, TreeModelObserver {
   void RecursivelyDelete(NodeDetails* node);
 
   // Returns the NodeDetails by node from the model.
-  NodeDetails* GetNodeDetails(TreeModelNode* node);
+  NodeDetails* GetNodeDetails(ui::TreeModelNode* node);
 
   // Returns the NodeDetails by identifier (lparam of the HTREEITEM).
   NodeDetails* GetNodeDetailsByID(int id);
@@ -256,7 +257,7 @@ class TreeView : public NativeControl, TreeModelObserver {
   // Returns the HTREEITEM for |node|. This is intended to be called when a
   // model mutation event occur with |node| as the parent. This returns null
   // if the user has never expanded |node| or all of its parents.
-  HTREEITEM GetTreeItemForNodeDuringMutation(TreeModelNode* node);
+  HTREEITEM GetTreeItemForNodeDuringMutation(ui::TreeModelNode* node);
 
   // The window function installed on the treeview.
   static LRESULT CALLBACK TreeWndProc(HWND window,
@@ -268,13 +269,13 @@ class TreeView : public NativeControl, TreeModelObserver {
   HWND tree_view_;
 
   // The model, may be null.
-  TreeModel* model_;
+  ui::TreeModel* model_;
 
   // Maps from id to NodeDetails.
   std::map<int, NodeDetails*> id_to_details_map_;
 
   // Maps from model entry to NodeDetails.
-  std::map<TreeModelNode*, NodeDetails*> node_to_details_map_;
+  std::map<ui::TreeModelNode*, NodeDetails*> node_to_details_map_;
 
   // Whether to automatically expand children when a parent node is expanded.
   bool auto_expand_children_;
@@ -289,7 +290,7 @@ class TreeView : public NativeControl, TreeModelObserver {
   TreeViewController* controller_;
 
   // Node being edited. If null, not editing.
-  TreeModelNode* editing_node_;
+  ui::TreeModelNode* editing_node_;
 
   // Whether or not the root is shown in the tree.
   bool root_shown_;
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
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 716f4d1..2277964 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "app/combobox_model.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ -12,6 +11,7 @@
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/combobox_model.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/button/checkbox.h"
@@ -40,6 +40,8 @@
 #include "views/window/window_gtk.h"
 #endif
 
+using ui::ComboboxModel;  // TODO(beng): remove
+
 namespace {
 const int kWindowWidth = 600;
 const int kWindowHeight = 500;
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 968ec6a..9c4be31 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -18,7 +18,7 @@ class Point;
 class Rect;
 }
 
-namespace menus {
+namespace ui {
 class Accelerator;
 }
 
@@ -196,8 +196,7 @@ class Widget {
 
   // Returns the accelerator given a command id. Returns false if there is
   // no accelerator associated with a given id, which is a common condition.
-  virtual bool GetAccelerator(int cmd_id,
-                              menus::Accelerator* accelerator) = 0;
+  virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator) = 0;
 
   // Returns the Window containing this Widget, or NULL if not contained in a
   // window.
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index cf12551..784f4d5 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -793,7 +793,7 @@ TooltipManager* WidgetGtk::GetTooltipManager() {
   return tooltip_manager_.get();
 }
 
-bool WidgetGtk::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) {
+bool WidgetGtk::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   NOTIMPLEMENTED();
   return false;
 }
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index 77f9c97..4895356 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -187,7 +187,7 @@ class WidgetGtk
   virtual void GenerateMousePressedForView(View* view,
                                            const gfx::Point& point);
   virtual TooltipManager* GetTooltipManager();
-  virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator);
+  virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const char* name, void* value);
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 4f9eb54..8fab0ae 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -408,7 +408,7 @@ void WidgetWin::GenerateMousePressedForView(View* view,
   ProcessMousePressed(point_in_widget.ToPOINT(), MK_LBUTTON, false, false);
 }
 
-bool WidgetWin::GetAccelerator(int cmd_id, menus::Accelerator* accelerator) {
+bool WidgetWin::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   return false;
 }
 
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 849f5c9..2d5d72a 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -229,7 +229,7 @@ class WidgetWin : public app::win::WindowImpl,
   virtual TooltipManager* GetTooltipManager();
   virtual void GenerateMousePressedForView(View* view,
                                            const gfx::Point& point);
-  virtual bool GetAccelerator(int cmd_id, menus::Accelerator* accelerator);
+  virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const char* name, void* value);