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

Unified Diff: views/focus/accelerator_handler.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First version that links (and crashes) Created 9 years, 3 months 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
Index: views/focus/accelerator_handler.h
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 9472dc76440320c13854e56ef4237f3731bc6f63..36c2f98ab70d4081c3a080291dabd6a0bb2a19b7 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -20,7 +20,8 @@
namespace views {
-#if defined(TOUCH_UI) && !defined(USE_WAYLAND)
+#if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \
+ || (!defined(WIN_OS) && defined(USE_AURA))
// Dispatch an XEvent to the RootView. Return true if the event was dispatched
// and handled, false otherwise.
bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent);
@@ -43,7 +44,7 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
#elif defined(USE_WAYLAND)
virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
ui::WaylandEvent* ev);
-#elif defined(TOUCH_UI)
+#elif defined(TOUCH_UI) || defined(USE_AURA)
virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
#else
virtual bool Dispatch(GdkEvent* event);
« ui/ui.gyp ('K') | « views/events/event.h ('k') | views/focus/accelerator_handler_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698