diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 01:54:37 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 01:54:37 +0000 |
| commit | 8b0724e9368b931ad997a0728d919c76b35712e3 (patch) | |
| tree | 6576f9238bfa41aeabbbc879936bc5f2552a2757 /ui/views/focus | |
| parent | 2c57b8dc7e5d12d842127b7fd9f4bc3e91e0e206 (diff) | |
| download | chromium_src-8b0724e9368b931ad997a0728d919c76b35712e3.zip chromium_src-8b0724e9368b931ad997a0728d919c76b35712e3.tar.gz chromium_src-8b0724e9368b931ad997a0728d919c76b35712e3.tar.bz2 | |
Remove more totally obvious usage of: defined(TOUCH_UI)
BUG=105046
TEST=none
Review URL: http://codereview.chromium.org/8656004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
| -rw-r--r-- | ui/views/focus/accelerator_handler.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h index c0f9591..7be2029 100644 --- a/ui/views/focus/accelerator_handler.h +++ b/ui/views/focus/accelerator_handler.h @@ -20,13 +20,11 @@ namespace views { -#if defined(TOUCH_UI) || defined(USE_AURA) -#if defined(USE_X11) && !defined(USE_WAYLAND) +#if defined(USE_AURA) && defined(USE_X11) && !defined(USE_WAYLAND) // 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_X11 && !USE_WAYLAND -#endif // TOUCH_UI || USE_AURA +#endif // USE_AURA && USE_X11 && !USE_WAYLAND // This class delegates the key messages to the associated FocusManager class // for the window that is receiving these messages for accelerator processing. @@ -41,7 +39,7 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher { #elif defined(USE_WAYLAND) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch( base::wayland::WaylandEvent* ev); -#elif defined(TOUCH_UI) || defined(USE_AURA) +#elif defined(USE_AURA) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev); #else virtual bool Dispatch(GdkEvent* event); |