Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: views/focus/accelerator_handler.h

Issue 8598020: wayland: cleanup ifdef in accelerator_handle.h for use_wayland and use_aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per review nits. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/accelerator_handler.h
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 71f86880e68747ae6cf17c35fed3666f7b0e7a28..e0036e02ad425b2bf762d858b7fe69ca7885c319 100644
--- a/views/focus/accelerator_handler.h
+++ b/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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698