diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /base/message_pump_glib_x.h | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'base/message_pump_glib_x.h')
| -rw-r--r-- | base/message_pump_glib_x.h | 4 |
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_; |