summaryrefslogtreecommitdiffstats
path: root/base/message_pump_wayland.h
diff options
context:
space:
mode:
authormsb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 19:23:46 +0000
committermsb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 19:23:46 +0000
commit43ddf9ade38d89fa12017122cd07085c93da397b (patch)
tree831a2c4b93ae5ebd14033eb833e89a7ecdf99ee4 /base/message_pump_wayland.h
parentdf9167beda5d69796316c3c862c849c73433c78a (diff)
downloadchromium_src-43ddf9ade38d89fa12017122cd07085c93da397b.zip
chromium_src-43ddf9ade38d89fa12017122cd07085c93da397b.tar.gz
chromium_src-43ddf9ade38d89fa12017122cd07085c93da397b.tar.bz2
wayland: define base:NativeEvent for Wayland
Fixes the use_wayland build which was broken by this commit: http://codereview.chromium.org/8113028 Similar to win, we create a wayland namespace inside base and define WaylandEvent there. Historical note: Wayland does not have a "native" event structure. Instead, the client is made aware of events via a callback executed in the context of display_run(): http://git.chromium.org/gitweb/?p=chromiumos/third_party/wayland-demos.git;a=blob;f=clients/window.c So we create WaylandEvent structure which takes the parameters from the callback and wraps them into a structure. For details, see: src/ui/wayland/events/wayland_event.h BUG=chromium:102903 TEST=Compiles but doesn't yet link with this change plus a series of others I'm working on. R=msw@chromium.org,oshima@chromium.org,mark@chromium.org Review URL: http://codereview.chromium.org/8378005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_wayland.h')
-rw-r--r--base/message_pump_wayland.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/base/message_pump_wayland.h b/base/message_pump_wayland.h
index 86b22a2..8734c7a 100644
--- a/base/message_pump_wayland.h
+++ b/base/message_pump_wayland.h
@@ -13,12 +13,12 @@ typedef struct _GMainContext GMainContext;
typedef struct _GPollFD GPollFD;
typedef struct _GSource GSource;
-namespace ui {
-union WaylandEvent;
-} // namespace ui
-
namespace base {
+namespace wayland {
+union WaylandEvent;
+}
+
// The documentation for this class is in message_pump_glib.h
class BASE_EXPORT MessagePumpObserver {
public:
@@ -31,7 +31,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 +52,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() {}