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

Unified Diff: ui/views/focus/accelerator_handler.h

Issue 8656004: Remove more totally obvious usage of: defined(TOUCH_UI) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | ui/views/ime/input_method_ibus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/accelerator_handler.h
diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h
index c0f95910e1b9d285d75f69adb9d447d68894f585..7be2029583e2c7a514265a9f50bdc980e481182f 100644
--- a/ui/views/focus/accelerator_handler.h
+++ b/ui/views/focus/accelerator_handler.h
@@ -20,13 +20,11 @@
namespace views {
-#if defined(TOUCH_UI) || defined(USE_AURA)
-#if defined(USE_X11) && !defined(USE_WAYLAND)
+#if defined(USE_AURA) && 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 // USE_X11 && !USE_WAYLAND
-#endif // TOUCH_UI || USE_AURA
+#endif // USE_AURA && USE_X11 && !USE_WAYLAND
// This class delegates the key messages to the associated FocusManager class
// for the window that is receiving these messages for accelerator processing.
@@ -41,7 +39,7 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {
#elif defined(USE_WAYLAND)
virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
base::wayland::WaylandEvent* ev);
-#elif defined(TOUCH_UI) || defined(USE_AURA)
+#elif defined(USE_AURA)
virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev);
#else
virtual bool Dispatch(GdkEvent* event);
« no previous file with comments | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | ui/views/ime/input_method_ibus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698