| Index: ui/views/focus/accelerator_handler.h
|
| diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h
|
| index 7897294752cc6dc04c542701ad9d0569c124585f..7f5cab1489a4ebe1409eb1e7c2a278717ed4a09f 100644
|
| --- a/ui/views/focus/accelerator_handler.h
|
| +++ b/ui/views/focus/accelerator_handler.h
|
| @@ -17,11 +17,11 @@
|
|
|
| namespace views {
|
|
|
| -#if defined(USE_AURA) && defined(USE_X11) && !defined(USE_WAYLAND)
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| // Dispatch an XEvent to the RootView. Return true if the event was dispatched
|
| // and handled, false otherwise.
|
| bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
|
| -#endif // USE_AURA && USE_X11 && !USE_WAYLAND
|
| +#endif // USE_AURA && USE_X11
|
|
|
| // This class delegates the key messages to the associated FocusManager class
|
| // for the window that is receiving these messages for accelerator processing.
|
| @@ -37,9 +37,6 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
|
| // focus manager
|
| #if defined(OS_WIN)
|
| virtual bool Dispatch(const MSG& msg) OVERRIDE;
|
| -#elif defined(USE_WAYLAND)
|
| - virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
|
| - base::wayland::WaylandEvent* ev) OVERRIDE;
|
| #elif defined(OS_MACOSX)
|
| // TODO(dhollowa): Implement on Mac. http://crbug.com/109946
|
| #elif defined(USE_AURA)
|
|
|