| Index: base/message_loop/message_pump_x11.h
|
| diff --git a/base/message_loop/message_pump_x11.h b/base/message_loop/message_pump_x11.h
|
| index ee20672e1eb3c646c25e6bcc4079b74e4da058fd..5fdfeeae663605ba0fc2eb8c24b66adeeda841f0 100644
|
| --- a/base/message_loop/message_pump_x11.h
|
| +++ b/base/message_loop/message_pump_x11.h
|
| @@ -10,27 +10,14 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_pump.h"
|
| -#include "base/message_loop/message_pump_dispatcher.h"
|
| #include "base/message_loop/message_pump_glib.h"
|
| -#include "base/message_loop/message_pump_observer.h"
|
| #include "base/observer_list.h"
|
|
|
| -// It would be nice to include the X11 headers here so that we use Window
|
| -// instead of its typedef of unsigned long, but we can't because everything in
|
| -// chrome includes us through base/message_loop/message_loop.h, and X11's crappy
|
| -// #define heavy headers muck up half of chrome.
|
| -
|
| -typedef struct _GPollFD GPollFD;
|
| -typedef struct _GSource GSource;
|
| typedef struct _XDisplay Display;
|
|
|
| namespace base {
|
|
|
| // This class implements a message-pump for dispatching X events.
|
| -//
|
| -// If there's a current dispatcher given through RunWithDispatcher(), that
|
| -// dispatcher receives events. Otherwise, we route to messages to dispatchers
|
| -// who have subscribed to messages from a specific X11 window.
|
| class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib {
|
| public:
|
| MessagePumpX11();
|
| @@ -42,21 +29,7 @@ class BASE_EXPORT MessagePumpX11 : public MessagePumpGlib {
|
| // Returns the UI or GPU message pump.
|
| static MessagePumpX11* Current();
|
|
|
| - // Adds an Observer, which will start receiving notifications immediately.
|
| - void AddObserver(MessagePumpObserver* observer);
|
| -
|
| - // Removes an Observer. It is safe to call this method while an Observer is
|
| - // receiving a notification callback.
|
| - void RemoveObserver(MessagePumpObserver* observer);
|
| -
|
| - // Sends the event to the observers.
|
| - void WillProcessXEvent(XEvent* xevent);
|
| - void DidProcessXEvent(XEvent* xevent);
|
| -
|
| private:
|
| - // List of observers.
|
| - ObserverList<MessagePumpObserver> observers_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MessagePumpX11);
|
| };
|
|
|
|
|