ash/wm/system_gesture_event_filter.cc - Issue 13947019: Clean up selected ash defines for MessagePumpLinux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: correctly fixed merge conflict 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:

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 938a7e914b998765bbe123c0d7e1ec141bdca82b..aff065bb561f13d1e75778b146ee52cfe0e88529 100644

--- a/ash/wm/system_gesture_event_filter.cc

+++ b/ash/wm/system_gesture_event_filter.cc

@@ -54,7 +54,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()) {

« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | no next file » | no next file with comments »