Index: base/message_pump_wayland.h |
diff --git a/base/message_pump_wayland.h b/base/message_pump_wayland.h |
index 86b22a224db5b66c6113f4c8dbc29ab3cb5979e2..4098781734a79f486337a2f987e5020f13bc6df7 100644 |
--- a/base/message_pump_wayland.h |
+++ b/base/message_pump_wayland.h |
@@ -8,15 +8,12 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/message_pump_glib.h" |
+#include "base/wayland/wayland_event.h" |
oshima
2011/11/10 16:13:38
forward decl seems to be enough.
Mandeep Singh Baines
2011/11/11 19:26:52
Done.
|
typedef struct _GMainContext GMainContext; |
typedef struct _GPollFD GPollFD; |
typedef struct _GSource GSource; |
-namespace ui { |
-union WaylandEvent; |
-} // namespace ui |
- |
namespace base { |
// The documentation for this class is in message_pump_glib.h |
@@ -31,7 +28,7 @@ class BASE_EXPORT MessagePumpObserver { |
// EVENT_HANDLED, it indicates the event has already been handled, so the |
// event is not processed any farther. If the method returns EVENT_CONTINUE, |
// the event dispatching proceeds as normal. |
- virtual EventStatus WillProcessEvent(ui::WaylandEvent* event); |
+ virtual EventStatus WillProcessEvent(wayland::WaylandEvent* event); |
protected: |
virtual ~MessagePumpObserver() {} |
@@ -52,7 +49,7 @@ class MessagePumpDispatcher { |
// Dispatches the event. If true is returned processing continues as |
// normal. If false is returned, the nested loop exits immediately. |
- virtual DispatchStatus Dispatch(ui::WaylandEvent* event) = 0; |
+ virtual DispatchStatus Dispatch(wayland::WaylandEvent* event) = 0; |
protected: |
virtual ~MessagePumpDispatcher() {} |