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

5 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/translate/languages_menu_model.cc b/chrome/browser/translate/languages_menu_model.cc
index e6934b5..5f631d1 100644
--- a/chrome/browser/translate/languages_menu_model.cc
+++ b/chrome/browser/translate/languages_menu_model.cc
@@ -10,7 +10,7 @@
 LanguagesMenuModel::LanguagesMenuModel(
     TranslateInfoBarDelegate* translate_delegate,
     LanguageType language_type)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       translate_infobar_delegate_(translate_delegate),
       language_type_(language_type) {
   for (int i = 0; i < translate_delegate->GetLanguageCount(); ++i)
@@ -35,7 +35,7 @@ bool LanguagesMenuModel::IsCommandIdEnabled(int command_id) const {
 
 bool LanguagesMenuModel::GetAcceleratorForCommandId(
     int command_id,
-    menus::Accelerator* accelerator) {
+    ui::Accelerator* accelerator) {
   return false;
 }
 
diff --git a/chrome/browser/translate/languages_menu_model.h b/chrome/browser/translate/languages_menu_model.h
index 8f91076..74a16a0 100644
--- a/chrome/browser/translate/languages_menu_model.h
+++ b/chrome/browser/translate/languages_menu_model.h
@@ -6,14 +6,14 @@
 #define CHROME_BROWSER_TRANSLATE_LANGUAGES_MENU_MODEL_H_
 #pragma once
 
-#include "app/menus/simple_menu_model.h"
+#include "ui/base/models/simple_menu_model.h"
 
 class TranslateInfoBarDelegate;
 
 // A menu model that builds the contents of the language menus in the translate
 // infobar. This menu has only one level (no submenus).
-class LanguagesMenuModel : public menus::SimpleMenuModel,
-                           public menus::SimpleMenuModel::Delegate {
+class LanguagesMenuModel : public ui::SimpleMenuModel,
+                           public ui::SimpleMenuModel::Delegate {
  public:
   enum LanguageType {
     ORIGINAL,
@@ -23,11 +23,11 @@ class LanguagesMenuModel : public menus::SimpleMenuModel,
                      LanguageType language_type);
   virtual ~LanguagesMenuModel();
 
-  // menus::SimpleMenuModel::Delegate implementation:
+  // ui::SimpleMenuModel::Delegate implementation:
   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);
 
  private:
diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc
index 4a074ce..d56f001 100644
--- a/chrome/browser/translate/options_menu_model.cc
+++ b/chrome/browser/translate/options_menu_model.cc
@@ -27,7 +27,7 @@ const char kAboutGoogleTranslateUrl[] =
 
 OptionsMenuModel::OptionsMenuModel(
     TranslateInfoBarDelegate* translate_delegate)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       translate_infobar_delegate_(translate_delegate) {
   string16 original_language = translate_delegate->GetLanguageDisplayableNameAt(
       translate_delegate->original_language_index());
@@ -94,7 +94,7 @@ bool OptionsMenuModel::IsCommandIdEnabled(int command_id) const {
 }
 
 bool OptionsMenuModel::GetAcceleratorForCommandId(
-    int command_id, menus::Accelerator* accelerator) {
+    int command_id, ui::Accelerator* accelerator) {
   return false;
 }
 
diff --git a/chrome/browser/translate/options_menu_model.h b/chrome/browser/translate/options_menu_model.h
index 68f9297..83f0f4e 100644
--- a/chrome/browser/translate/options_menu_model.h
+++ b/chrome/browser/translate/options_menu_model.h
@@ -6,23 +6,23 @@
 #define CHROME_BROWSER_TRANSLATE_OPTIONS_MENU_MODEL_H_
 #pragma once
 
-#include "app/menus/simple_menu_model.h"
+#include "ui/base/models/simple_menu_model.h"
 
 class TranslateInfoBarDelegate;
 
 // A menu model that builds the contents of the options menu in the translate
 // infobar. This menu has only one level (no submenus).
-class OptionsMenuModel : public menus::SimpleMenuModel,
-                         public menus::SimpleMenuModel::Delegate {
+class OptionsMenuModel : public ui::SimpleMenuModel,
+                         public ui::SimpleMenuModel::Delegate {
  public:
   explicit OptionsMenuModel(TranslateInfoBarDelegate* translate_delegate);
   virtual ~OptionsMenuModel();
 
-  // menus::SimpleMenuModel::Delegate implementation:
+  // ui::SimpleMenuModel::Delegate implementation:
   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);
 
  private:
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc
index f821b5c..f3d1d0c 100644
--- a/chrome/browser/translate/translate_manager_unittest.cc
+++ b/chrome/browser/translate/translate_manager_unittest.cc
@@ -268,7 +268,7 @@ class TestRenderViewContextMenu : public RenderViewContextMenu {
   virtual void PlatformInit() { }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      menus::Accelerator* accelerator) { return false; }
+      ui::Accelerator* accelerator) { return false; }
 
  private:
   TestRenderViewContextMenu(TabContents* tab_contents,