diff options
| author | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:41:35 +0000 |
|---|---|---|
| committer | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 19:41:35 +0000 |
| commit | 882e27ed5c8f54c2ac783594a07a78dbb9dc6c30 (patch) | |
| tree | 098e4b94335b2ce6d7604d9421f3b33a8912a9f0 /views/views.gyp | |
| parent | 4e5ec62100ffdcda4790e660e853807fd8c2576d (diff) | |
| download | chromium_src-882e27ed5c8f54c2ac783594a07a78dbb9dc6c30.zip chromium_src-882e27ed5c8f54c2ac783594a07a78dbb9dc6c30.tar.gz chromium_src-882e27ed5c8f54c2ac783594a07a78dbb9dc6c30.tar.bz2 | |
Add MenuModelAdapter to wrap ui::MenuModel with views::MenuDelegate interface.
- added ViewsDelegate::GetDispositionForEvent() pure virtual
- added MenuModelAdapter
- added unit test for MenuModelAdapter
- added comment for MenuModel::GetFirstItemIndex() that callers may pass NULL for NativeMenu argument
- fixed index offset bug in MenuModel::GetModelAndIndexForCommandId()
- fixed spurious call to MenuDelegate::IsCommandEnabled()
BUG=none
TEST=included
Review URL: http://codereview.chromium.org/7067032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/views/views.gyp b/views/views.gyp index c1e24cd..c45a3c9 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -151,6 +151,8 @@ 'controls/menu/menu_item_view.h', 'controls/menu/menu_item_view_gtk.cc', 'controls/menu/menu_item_view_win.cc', + 'controls/menu/menu_model_adapter.cc', + 'controls/menu/menu_model_adapter.h', 'controls/menu/menu_scroll_view_container.cc', 'controls/menu/menu_scroll_view_container.h', 'controls/menu/menu_separator.h', @@ -483,6 +485,7 @@ 'controls/tabbed_pane/tabbed_pane_unittest.cc', 'controls/table/table_view_unittest.cc', 'controls/combobox/native_combobox_views_unittest.cc', + 'controls/menu/menu_model_adapter_unittest.cc', 'controls/textfield/native_textfield_views_unittest.cc', 'controls/textfield/textfield_views_model_unittest.cc', 'events/event_unittest.cc', |