diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
| commit | 44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch) | |
| tree | a997fb0565558d63e0eab62b631ef984de3e9596 /chrome/browser/background_mode_manager.h | |
| parent | 0c1c047d641a599ffffa280ab50d564cedb3e436 (diff) | |
| download | chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.zip chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.gz chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/background_mode_manager.h')
| -rw-r--r-- | chrome/browser/background_mode_manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/background_mode_manager.h b/chrome/browser/background_mode_manager.h index 9407d4a..b874fd6 100644 --- a/chrome/browser/background_mode_manager.h +++ b/chrome/browser/background_mode_manager.h @@ -6,13 +6,13 @@ #define CHROME_BROWSER_BACKGROUND_MODE_MANAGER_H_ #pragma once -#include "app/menus/simple_menu_model.h" #include "base/gtest_prod_util.h" #include "chrome/browser/background_application_list_model.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/status_icons/status_icon.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "ui/base/models/simple_menu_model.h" class Browser; class CommandLine; @@ -38,7 +38,7 @@ class StatusTray; // background. class BackgroundModeManager : public NotificationObserver, - public menus::SimpleMenuModel::Delegate, + public ui::SimpleMenuModel::Delegate, public BackgroundApplicationListModel::Observer { public: BackgroundModeManager(Profile* profile, CommandLine* command_line); @@ -69,7 +69,7 @@ class BackgroundModeManager 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); // Open an application in a new tab, opening a new window if needed. @@ -151,7 +151,7 @@ class BackgroundModeManager // Reference to our status icon's context menu (if any) - owned by the // status_icon_ - menus::SimpleMenuModel* context_menu_; + ui::SimpleMenuModel* context_menu_; // Set to the position of the first application entry in the status icon's // context menu. |