diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 19:27:51 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 19:27:51 +0000 |
| commit | ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38 (patch) | |
| tree | 40a0f93e46235dcb04514e4fbee65c874ddf6b71 /base/message_pump_x.h | |
| parent | 32354b64deff166de178809850f379da837819eb (diff) | |
| download | chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.zip chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.tar.gz chromium_src-ab9fe0f8b3127a8cc224322107d2f77fe0a9ef38.tar.bz2 | |
Revert r114168 "Refactor MessagePumpX to dispatch events inside of the source Dispatch function."
This reverts commit bae6675d851184f2be0ac117c1a847289c1c7bd9.
TBR=piman@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8931009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_x.h')
| -rw-r--r-- | base/message_pump_x.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/message_pump_x.h b/base/message_pump_x.h index 62597a2..e6bb71c 100644 --- a/base/message_pump_x.h +++ b/base/message_pump_x.h @@ -45,6 +45,9 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { MessagePumpX(); virtual ~MessagePumpX(); + // Overridden from MessagePumpGlib: + virtual bool RunOnce(GMainContext* context, bool block) OVERRIDE; + // Returns default X Display. static Display* GetDefaultXDisplay(); @@ -54,10 +57,6 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { // Sets the default dispatcher to process native events. static void SetDefaultDispatcher(MessagePumpDispatcher* dispatcher); - // Internal function. Called by the glib source dispatch function. Processes - // all available X events. - gboolean DispatchXEvents(); - private: // Initializes the glib event source for X. void InitXSource(); |