| Index: ui/display/chromeos/x11/native_display_event_dispatcher_x11.h
|
| diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h
|
| index d173efdb909083bbf5bd163f13bb350730e87d71..9418813b965abbc2dcbb69348f50f7d3d2b6c147 100644
|
| --- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h
|
| +++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h
|
| @@ -5,29 +5,28 @@
|
| #ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
|
| #define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
|
|
|
| -#include "base/message_loop/message_pump_dispatcher.h"
|
| #include "base/time/tick_clock.h"
|
| #include "base/time/time.h"
|
| #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
|
| +#include "ui/events/platform/platform_event_dispatcher.h"
|
|
|
| namespace ui {
|
|
|
| +// The implementation is interested in the cases of RRNotify events which
|
| +// correspond to output add/remove events. Note that Output add/remove events
|
| +// are sent in response to our own reconfiguration operations so spurious events
|
| +// are common. Spurious events will have no effect.
|
| class DISPLAY_EXPORT NativeDisplayEventDispatcherX11
|
| - : public base::MessagePumpDispatcher {
|
| + : public ui::PlatformEventDispatcher {
|
| public:
|
| NativeDisplayEventDispatcherX11(
|
| NativeDisplayDelegateX11::HelperDelegate* delegate,
|
| int xrandr_event_base);
|
| virtual ~NativeDisplayEventDispatcherX11();
|
|
|
| - // base::MessagePumpDispatcher overrides:
|
| - //
|
| - // Called when an RRNotify event is received. The implementation is
|
| - // interested in the cases of RRNotify events which correspond to output
|
| - // add/remove events. Note that Output add/remove events are sent in response
|
| - // to our own reconfiguration operations so spurious events are common.
|
| - // Spurious events will have no effect.
|
| - virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
|
| + // ui::PlatformEventDispatcher:
|
| + virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE;
|
| + virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE;
|
|
|
| void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
|
|
|
|
|