diff options
| author | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 19:23:46 +0000 |
|---|---|---|
| committer | msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 19:23:46 +0000 |
| commit | 43ddf9ade38d89fa12017122cd07085c93da397b (patch) | |
| tree | 831a2c4b93ae5ebd14033eb833e89a7ecdf99ee4 /ui/wayland/wayland_input_device.cc | |
| parent | df9167beda5d69796316c3c862c849c73433c78a (diff) | |
| download | chromium_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 'ui/wayland/wayland_input_device.cc')
| -rw-r--r-- | ui/wayland/wayland_input_device.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/wayland/wayland_input_device.cc b/ui/wayland/wayland_input_device.cc index 100e19d..034b4a1 100644 --- a/ui/wayland/wayland_input_device.cc +++ b/ui/wayland/wayland_input_device.cc @@ -7,10 +7,12 @@ #include <X11/extensions/XKBcommon.h> #include <wayland-client.h> -#include "ui/wayland/events/wayland_event.h" +#include "base/wayland/wayland_event.h" #include "ui/wayland/wayland_widget.h" #include "ui/wayland/wayland_window.h" +using namespace base::wayland; + namespace ui { WaylandInputDevice::WaylandInputDevice( |