summaryrefslogtreecommitdiffstats
path: root/base/message_pump_glib_x.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 /base/message_pump_glib_x.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 'base/message_pump_glib_x.h')
-rw-r--r--base/message_pump_glib_x.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/message_pump_glib_x.h b/base/message_pump_glib_x.h
index c6d98e3..fc3f3b1 100644
--- a/base/message_pump_glib_x.h
+++ b/base/message_pump_glib_x.h
@@ -60,6 +60,10 @@ class MessagePumpGlibX : public MessagePumpForUI {
// The event source for GDK events.
GSource* gdksource_;
+ // The default GDK event dispatcher. This is stored so that it can be restored
+ // when necessary during nested event dispatching.
+ gboolean (*gdkdispatcher_)(GSource*, GSourceFunc, void*);
+
// Indicates whether a GDK event was injected by chrome (when |true|) or if it
// was captured and being processed by GDK (when |false|).
bool dispatching_event_;