summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/nested_dispatcher_gtk.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-05 04:00:59 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-05 04:00:59 +0000
commit7443494b88d2c04f3c07ebf98f0e6d68478eed7d (patch)
tree9211568b7d60a93dc8bf03a57a725dc8c8d967b7 /views/controls/menu/nested_dispatcher_gtk.h
parent6f7e1d63f9c97c7f8f11af86f78f80934064a9a9 (diff)
downloadchromium_src-7443494b88d2c04f3c07ebf98f0e6d68478eed7d.zip
chromium_src-7443494b88d2c04f3c07ebf98f0e6d68478eed7d.tar.gz
chromium_src-7443494b88d2c04f3c07ebf98f0e6d68478eed7d.tar.bz2
A non-GTK version of menus for touchui.
For the menus to work correctly, the X messge pump also needs updating to allow nested event dispatching. BUG=None TEST=On a touchui build, non-GTK context menus in web-pages should work correctly. Review URL: http://codereview.chromium.org/5110011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/nested_dispatcher_gtk.h')
-rw-r--r--views/controls/menu/nested_dispatcher_gtk.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/menu/nested_dispatcher_gtk.h b/views/controls/menu/nested_dispatcher_gtk.h
index f17e9a4..c8a6563 100644
--- a/views/controls/menu/nested_dispatcher_gtk.h
+++ b/views/controls/menu/nested_dispatcher_gtk.h
@@ -41,7 +41,8 @@ class NestedDispatcherGtk : public MessageLoopForUI::Dispatcher {
virtual bool Dispatch(GdkEvent* event);
#if defined(TOUCH_UI)
- virtual bool Dispatch(XEvent* xevent);
+ virtual base::MessagePumpGlibXDispatcher::DispatchStatus Dispatch(
+ XEvent* xevent);
#endif
// Creator of the nested loop.