summaryrefslogtreecommitdiffstats
path: root/views/views.gyp
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 17:48:11 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 17:48:11 +0000
commitbead2c9fb8932fde4bf40a61b9563401d11c69ef (patch)
tree3253e54b789680322ae26e6eaa9c7af380652af5 /views/views.gyp
parent805ca7ed20f92d79e02772ab8b28636a863b21bb (diff)
downloadchromium_src-bead2c9fb8932fde4bf40a61b9563401d11c69ef.zip
chromium_src-bead2c9fb8932fde4bf40a61b9563401d11c69ef.tar.gz
chromium_src-bead2c9fb8932fde4bf40a61b9563401d11c69ef.tar.bz2
Menus in the views desktop. Adds MenuHostViews. This is buggy due to rendering issues I believe.
Moves IsMouseButtonDown to a static method on Widget that is implemented by each platform. It needs to be static as it can be called before the NativeWidget is fully initialized, and does not depend on any NativeWidget state. BUG=none TEST=none Review URL: http://codereview.chromium.org/7253018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
-rw-r--r--views/views.gyp6
1 files changed, 4 insertions, 2 deletions
diff --git a/views/views.gyp b/views/views.gyp
index 9003a44..6efc27f 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -142,12 +142,14 @@
'controls/menu/menu_gtk.h',
'controls/menu/menu_host.cc',
'controls/menu/menu_host.h',
+ 'controls/menu/menu_host_gtk.cc',
+ 'controls/menu/menu_host_gtk.h',
'controls/menu/menu_host_root_view.cc',
'controls/menu/menu_host_root_view.h',
+ 'controls/menu/menu_host_views.cc',
+ 'controls/menu/menu_host_views.h',
'controls/menu/menu_host_win.cc',
'controls/menu/menu_host_win.h',
- 'controls/menu/menu_host_gtk.cc',
- 'controls/menu/menu_host_gtk.h',
'controls/menu/menu_item_view.cc',
'controls/menu/menu_item_view.h',
'controls/menu/menu_item_view_gtk.cc',