wayland: cleanup ifdef in accelerator_handle.h for use_wayland and use_aura

BUG=102903
TEST=compile

Change-Id: Ia9780044a47c91b8172710cc92481af60433b3a1

R=sky@chromium.org,jcivelli@chromium.org,saintlou@chromium.org,dnicoara@chromium.org


Review URL: http://codereview.chromium.org/8598020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110748 0039d316-1c4b-4281-b951-d872f2087c98

views/focus/accelerator_handler.h

@@ -20,13 +20,13 @@
 
 namespace views {
 
-#if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \
-    || (!defined(OS_WIN) && defined(USE_AURA))
+#if defined(TOUCH_UI) || defined(USE_AURA)
+#if 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  // TOUCH_UI
+#endif  // USE_X11 && !USE_WAYLAND
+#endif  // TOUCH_UI || USE_AURA
 
 // This class delegates the key messages to the associated FocusManager class
 // for the window that is receiving these messages for accelerator processing.