athena/main/athena_launcher.cc - Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/

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: athena/main/athena_launcher.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens

Patch Set: fix ozone Created 6 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

Index: athena/main/athena_launcher.cc

diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc

index 6ac68cbf9f2ec63f86e395baba29090c62475746..585c7663bea0912947e7644aa2915036ecd9f3c4 100644

--- a/athena/main/athena_launcher.cc

+++ b/athena/main/athena_launcher.cc

@@ -37,7 +37,7 @@

#include "ui/wm/core/visibility_controller.h"

#if defined(USE_X11)

-#include "ui/events/x/touch_factory_x11.h"

+#include "ui/events/devices/x11/touch_factory_x11.h"

#endif

namespace athena {

« no previous file with comments | « ash/wm/system_gesture_event_filter.cc ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | no next file with comments »