| Index: ui/events/platform/x11/x11_event_source.h
|
| diff --git a/ui/events/platform/x11/x11_event_source.h b/ui/events/platform/x11/x11_event_source.h
|
| index 93a371e4aca264578bf226a7b324b5e5ab058e40..b05918dfd14a48f7286dac6d9d3e0a7d0f56b63f 100644
|
| --- a/ui/events/platform/x11/x11_event_source.h
|
| +++ b/ui/events/platform/x11/x11_event_source.h
|
| @@ -41,22 +41,16 @@ class EVENTS_EXPORT X11EventSource : public PlatformEventSource {
|
| // functions which require a mapped window.
|
| void BlockUntilWindowMapped(XID window);
|
|
|
| - private:
|
| - // Initializes the glib event source for X.
|
| - void InitXSource();
|
| + protected:
|
| + XDisplay* display() { return display_; }
|
|
|
| + private:
|
| // PlatformEventSource:
|
| virtual uint32_t DispatchEvent(XEvent* xevent) OVERRIDE;
|
|
|
| // The connection to the X11 server used to receive the events.
|
| XDisplay* display_;
|
|
|
| - // The GLib event source for X events.
|
| - GSource* x_source_;
|
| -
|
| - // The poll attached to |x_source_|.
|
| - scoped_ptr<GPollFD> x_poll_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(X11EventSource);
|
| };
|
|
|
|
|