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 /views/controls/menu/native_menu_x.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 'views/controls/menu/native_menu_x.h')
| -rw-r--r-- | views/controls/menu/native_menu_x.h | 8 |
1 files changed, 4 insertions, 4 deletions
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); |