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

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/download/download_shelf.h b/chrome/browser/download/download_shelf.h
index ab565fa..56700d2 100644
--- a/chrome/browser/download/download_shelf.h
+++ b/chrome/browser/download/download_shelf.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
 #pragma once
 
-#include "app/menus/simple_menu_model.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
+#include "ui/base/models/simple_menu_model.h"
 
 class BaseDownloadItemModel;
 class Browser;
@@ -44,7 +44,7 @@ class DownloadShelf {
 
 // Logic for the download shelf context menu. Platform specific subclasses are
 // responsible for creating and running the menu.
-class DownloadShelfContextMenu : public menus::SimpleMenuModel::Delegate {
+class DownloadShelfContextMenu : public ui::SimpleMenuModel::Delegate {
  public:
   virtual ~DownloadShelfContextMenu();
 
@@ -62,17 +62,17 @@ class DownloadShelfContextMenu : public menus::SimpleMenuModel::Delegate {
  protected:
   explicit DownloadShelfContextMenu(BaseDownloadItemModel* download_model);
 
-  menus::SimpleMenuModel* GetInProgressMenuModel();
-  menus::SimpleMenuModel* GetFinishedMenuModel();
+  ui::SimpleMenuModel* GetInProgressMenuModel();
+  ui::SimpleMenuModel* GetFinishedMenuModel();
   // Information source.
   DownloadItem* download_;
 
-  // menus::SimpleMenuModel::Delegate implementation:
+  // ui::SimpleMenuModel::Delegate implementation:
   virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool IsCommandIdChecked(int command_id) const;
   virtual void ExecuteCommand(int command_id);
   virtual bool GetAcceleratorForCommandId(int command_id,
-                                          menus::Accelerator* accelerator);
+                                          ui::Accelerator* accelerator);
   virtual bool IsItemForCommandIdDynamic(int command_id) const;
   virtual string16 GetLabelForCommandId(int command_id) const;
 
@@ -82,8 +82,8 @@ class DownloadShelfContextMenu : public menus::SimpleMenuModel::Delegate {
  private:
   // We show slightly different menus if the download is in progress vs. if the
   // download has finished.
-  scoped_ptr<menus::SimpleMenuModel> in_progress_download_menu_model_;
-  scoped_ptr<menus::SimpleMenuModel> finished_download_menu_model_;
+  scoped_ptr<ui::SimpleMenuModel> in_progress_download_menu_model_;
+  scoped_ptr<ui::SimpleMenuModel> finished_download_menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfContextMenu);
 };