| Index: ui/ozone/platform/wayland/wayland_display.h
|
| diff --git a/ui/ozone/platform/wayland/wayland_display.h b/ui/ozone/platform/wayland/wayland_display.h
|
| index ac0191dc552147281f7dea8b14699ab2adb471dd..3637dfb503d474b003a44b8a7d6a9b1203746d42 100644
|
| --- a/ui/ozone/platform/wayland/wayland_display.h
|
| +++ b/ui/ozone/platform/wayland/wayland_display.h
|
| @@ -11,6 +11,7 @@
|
| #include "ui/events/platform/platform_event_source.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/ozone/platform/wayland/wayland_object.h"
|
| +#include "ui/ozone/platform/wayland/wayland_pointer.h"
|
|
|
| namespace ui {
|
|
|
| @@ -37,6 +38,8 @@ class WaylandDisplay : public PlatformEventSource,
|
| void RemoveWindow(WaylandWindow* window);
|
|
|
| private:
|
| + void DispatchUiEvent(Event* event);
|
| +
|
| // PlatformEventSource
|
| void OnDispatcherListChanged() override;
|
|
|
| @@ -52,6 +55,10 @@ class WaylandDisplay : public PlatformEventSource,
|
| uint32_t version);
|
| static void GlobalRemove(void* data, wl_registry* registry, uint32_t name);
|
|
|
| + // wl_seat_listener
|
| + static void Capabilities(void* data, wl_seat* seat, uint32_t capabilities);
|
| + static void Name(void* data, wl_seat* seat, const char* name);
|
| +
|
| // xdg_shell_listener
|
| static void Ping(void* data, xdg_shell* shell, uint32_t serial);
|
|
|
| @@ -60,9 +67,12 @@ class WaylandDisplay : public PlatformEventSource,
|
| wl::Object<wl_display> display_;
|
| wl::Object<wl_registry> registry_;
|
| wl::Object<wl_compositor> compositor_;
|
| + wl::Object<wl_seat> seat_;
|
| wl::Object<wl_shm> shm_;
|
| wl::Object<xdg_shell> shell_;
|
|
|
| + scoped_ptr<WaylandPointer> pointer_;
|
| +
|
| bool watching_ = false;
|
| base::MessagePumpLibevent::FileDescriptorWatcher controller_;
|
|
|
|
|