summaryrefslogtreecommitdiffstats
path: root/base/message_pump_wayland.h
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 16:34:31 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 16:34:31 +0000
commit2f814d30264d0ebcb5f452d3b0c785b72e240ead (patch)
tree085c3e50bc38c0eb6a81765f2483ee92c8fc67c8 /base/message_pump_wayland.h
parent33e1c37730f7d404b61f8bed2eb768f9902b1b64 (diff)
downloadchromium_src-2f814d30264d0ebcb5f452d3b0c785b72e240ead.zip
chromium_src-2f814d30264d0ebcb5f452d3b0c785b72e240ead.tar.gz
chromium_src-2f814d30264d0ebcb5f452d3b0c785b72e240ead.tar.bz2
Refactor MessagePumpX to dispatch events inside of the source Dispatch function.
Also clean up MessagePumpGlib. BUG=None TEST=None Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=114168 Review URL: http://codereview.chromium.org/8872055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_wayland.h')
-rw-r--r--base/message_pump_wayland.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/base/message_pump_wayland.h b/base/message_pump_wayland.h
index 706914a..89c9b8f 100644
--- a/base/message_pump_wayland.h
+++ b/base/message_pump_wayland.h
@@ -10,10 +10,6 @@
#include "base/message_pump_glib.h"
#include "base/message_pump_observer.h"
-typedef struct _GMainContext GMainContext;
-typedef struct _GPollFD GPollFD;
-typedef struct _GSource GSource;
-
namespace base {
namespace wayland {
@@ -41,23 +37,7 @@ class MessagePumpDispatcher {
virtual ~MessagePumpDispatcher() {}
};
-class BASE_EXPORT MessagePumpWayland : public MessagePumpGlib {
-
- public:
- MessagePumpWayland();
- virtual ~MessagePumpWayland();
-
- // Overridden from MessagePumpGlib
- virtual bool RunOnce(GMainContext* context, bool block) OVERRIDE;
- private:
-
- // This is a GLib structure that we can add event sources to.
- GMainContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(MessagePumpWayland);
-};
-
-typedef MessagePumpWayland MessagePumpForUI;
+typedef MessagePumpGlib MessagePumpForUI;
} // namespace base