ui/aura/window_tree_host_x11.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: ui/aura/window_tree_host_x11.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: ui/aura/window_tree_host_x11.cc

diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc

index 2ecc5a5987651ed4827dd6e2c9cd39d58301efb6..4914b25a95a8d2445f1ff9a64d70f697e21f127c 100644

--- a/ui/aura/window_tree_host_x11.cc

+++ b/ui/aura/window_tree_host_x11.cc

@@ -35,15 +35,15 @@

#include "ui/compositor/compositor.h"

#include "ui/compositor/dip_util.h"

#include "ui/compositor/layer.h"

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

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

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

#include "ui/events/event.h"

#include "ui/events/event_switches.h"

#include "ui/events/event_utils.h"

#include "ui/events/keycodes/keyboard_codes.h"

#include "ui/events/platform/platform_event_observer.h"

#include "ui/events/platform/x11/x11_event_source.h"

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

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

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

#include "ui/gfx/screen.h"

using std::max;

« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | ui/base/touch/touch_device_aurax11.cc » ('j') | no next file with comments »