diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 17:50:26 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 17:50:26 +0000 |
| commit | b284843ba6a1e90c12f91eaf796726433dc2537d (patch) | |
| tree | 96edc5a4528e4d685c89544bfc13712e2984964a /chrome/browser/autocomplete/autocomplete_edit_view_win.h | |
| parent | e83ce1e3f2fcacb3d400287d78567d22a2a06cae (diff) | |
| download | chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.zip chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.tar.gz chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.tar.bz2 | |
Refactor the menu model to live outside views/ so it can be shared
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/465005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_win.h')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index 0d20df0..03a1d89 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -13,6 +13,7 @@ #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl. #include "app/gfx/font.h" +#include "app/menus/simple_menu_model.h" #include "base/scoped_comptr_win.h" #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete.h" @@ -20,7 +21,6 @@ #include "chrome/browser/toolbar_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/common/page_transition_types.h" -#include "views/controls/menu/simple_menu_model.h" #include "webkit/glue/window_open_disposition.h" class AutocompletePopupModel; @@ -29,6 +29,7 @@ class Profile; class TabContents; namespace views { class View; +class Menu2; } class AutocompleteEditController; @@ -45,7 +46,7 @@ class AutocompleteEditViewWin CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_NOHIDESEL> >, public CRichEditCommands<AutocompleteEditViewWin>, - public views::SimpleMenuModel::Delegate, + public menus::SimpleMenuModel::Delegate, public AutocompleteEditView { public: struct State { @@ -183,11 +184,11 @@ class AutocompleteEditViewWin DEFAULT_REFLECTION_HANDLER() // avoids black margin area END_MSG_MAP() - // SimpleMenuModel::Delegate + // menus::SimpleMenuModel::Delegate virtual bool IsCommandIdChecked(int command_id) const; virtual bool IsCommandIdEnabled(int command_id) const; virtual bool GetAcceleratorForCommandId(int command_id, - views::Accelerator* accelerator); + menus::Accelerator* accelerator); virtual bool IsLabelForCommandIdDynamic(int command_id) const; virtual std::wstring GetLabelForCommandId(int command_id) const; virtual void ExecuteCommand(int command_id); @@ -440,7 +441,7 @@ class AutocompleteEditViewWin CHARRANGE saved_selection_for_focus_change_; // The context menu for the edit. - scoped_ptr<views::SimpleMenuModel> context_menu_contents_; + scoped_ptr<menus::SimpleMenuModel> context_menu_contents_; scoped_ptr<views::Menu2> context_menu_; // Font we're using. We keep a reference to make sure the font supplied to |