diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 00:33:04 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 00:33:04 +0000 |
| commit | 328ce55f74ce4316a4fbb1286be14bf603e841e6 (patch) | |
| tree | dda8a6ff77f9828dad816d6b02a21e65605f9f1f /ui/views/focus/accelerator_handler.h | |
| parent | 9d7a49d744c7431eded94842d9bab9f7eae7c7b6 (diff) | |
| download | chromium_src-328ce55f74ce4316a4fbb1286be14bf603e841e6.zip chromium_src-328ce55f74ce4316a4fbb1286be14bf603e841e6.tar.gz chromium_src-328ce55f74ce4316a4fbb1286be14bf603e841e6.tar.bz2 | |
Remove WAYLAND port
Also removed skia/ext/canvas_paint_x.h which is not in use.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10009024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus/accelerator_handler.h')
| -rw-r--r-- | ui/views/focus/accelerator_handler.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h index 7897294..7f5cab1 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) |