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

views/focus/accelerator_handler.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #define VIEWS_FOCUS_ACCELERATOR_HANDLER_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include <set>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "views/views_export.h"
 
 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.
 class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
  public:
   AcceleratorHandler();
 
   // Dispatcher method. This returns true if an accelerator was processed by the
   // focus manager
 #if defined(OS_WIN)
@@ skipping 12 matching lines @@
   // The keys currently pressed and consumed by the FocusManager.
   std::set<WPARAM> pressed_keys_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorHandler);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_FOCUS_ACCELERATOR_HANDLER_H_