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

views/focus/accelerator_handler.h

Index: views/focus/accelerator_handler.h
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 71f86880e68747ae6cf17c35fed3666f7b0e7a28..c8cd5ca96740682aa637f7439ad44632d670bedd 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -20,12 +20,12 @@
 
 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)

[sky, 2011/11/18 19:04:52]

'defined (USE' -> 'defined(USE'

 // 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

[sky, 2011/11/18 19:04:52]

Your comment block doesn't match the ifdef.

 #endif  // TOUCH_UI
 
 // This class delegates the key messages to the associated FocusManager class