diff options
Diffstat (limited to 'chrome/browser/ui/views/wrench_menu.h')
| -rw-r--r-- | chrome/browser/ui/views/wrench_menu.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/wrench_menu.h b/chrome/browser/ui/views/wrench_menu.h index 6efaaa8..f77e67d 100644 --- a/chrome/browser/ui/views/wrench_menu.h +++ b/chrome/browser/ui/views/wrench_menu.h @@ -9,9 +9,9 @@ #include <map> #include <utility> -#include "app/menus/menu_model.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "ui/base/models/menu_model.h" #include "views/controls/menu/menu_delegate.h" class Browser; @@ -28,7 +28,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, public: explicit WrenchMenu(Browser* browser); - void Init(menus::MenuModel* model); + void Init(ui::MenuModel* model); // Shows the menu relative to the specified view. void RunMenu(views::MenuButton* host); @@ -45,7 +45,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, class CutCopyPasteView; class ZoomView; - typedef std::pair<menus::MenuModel*,int> Entry; + typedef std::pair<ui::MenuModel*,int> Entry; typedef std::map<int,Entry> IDToEntry; ~WrenchMenu(); @@ -54,20 +54,20 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, // |PopulateMenu| for any submenu. |next_id| is incremented for every menu // that is created. void PopulateMenu(views::MenuItemView* parent, - menus::MenuModel* model, + ui::MenuModel* model, int* next_id); // Adds a new menu to |parent| to represent the MenuModel/index pair passed // in. views::MenuItemView* AppendMenuItem(views::MenuItemView* parent, - menus::MenuModel* model, + ui::MenuModel* model, int index, - menus::MenuModel::ItemType menu_type, + ui::MenuModel::ItemType menu_type, int* next_id); // Invoked from the cut/copy/paste menus. Cancels the current active menu and // activates the menu item in |model| at |index|. - void CancelAndEvaluate(menus::MenuModel* model, int index); + void CancelAndEvaluate(ui::MenuModel* model, int index); // The views menu. scoped_ptr<views::MenuItemView> root_; @@ -83,7 +83,7 @@ class WrenchMenu : public base::RefCounted<WrenchMenu>, // If |selected_menu_model_| is non-null after the menu completes // ActivatedAt is invoked. This is done so that ActivatedAt isn't invoked // while the message loop is nested. - menus::MenuModel* selected_menu_model_; + ui::MenuModel* selected_menu_model_; int selected_index_; DISALLOW_COPY_AND_ASSIGN(WrenchMenu); |