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

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 13947019: Clean up selected ash defines for MessagePumpLinux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 7 years, 8 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
« ash/shell.h ('K') | « ash/system/chromeos/tray_display.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index 6810eaeb54b4b3934a1d9b7410b3d265c1389186..027d048118205a1d353828fc0f9871158b71be63 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -56,7 +56,8 @@ SystemGestureEventFilter::~SystemGestureEventFilter() {
}
void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) {
-#if defined(OS_CHROMEOS)
+// TODO(rjkroege): Remove USE_MESSAGEPUMP_LINUX guard once mice are supported.
+#if defined(OS_CHROMEOS) && !defined(USE_MESSAGEPUMP_LINUX)
if (event->type() == ui::ET_MOUSE_PRESSED && event->native_event() &&
ui::TouchFactory::GetInstance()->IsTouchDevicePresent() &&
Shell::GetInstance()->delegate()) {
« ash/shell.h ('K') | « ash/system/chromeos/tray_display.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698