ui/events/devices/device_data_manager_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/events/devices/device_data_manager_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: Fixed ash include Created 6 years, 2 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

Index: ui/events/devices/device_data_manager_x11.cc

diff --git a/ui/events/x/device_data_manager_x11.cc b/ui/events/devices/device_data_manager_x11.cc

similarity index 99%

rename from ui/events/x/device_data_manager_x11.cc

rename to ui/events/devices/device_data_manager_x11.cc

index 4b29631d1a4927ca41d04f6f8a4053b39846f3e9..0283d9b2ccadcccff6d8974191db60e48fad9ada 100644

--- a/ui/events/x/device_data_manager_x11.cc

+++ b/ui/events/devices/device_data_manager_x11.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include <X11/extensions/XInput.h>

#include <X11/extensions/XInput2.h>

@@ -13,9 +13,9 @@

#include "base/logging.h"

#include "base/memory/singleton.h"

#include "base/sys_info.h"

+#include "ui/events/devices/keyboard_device.h"

#include "ui/events/event_constants.h"

#include "ui/events/event_switches.h"

-#include "ui/events/keyboard_device.h"

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

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

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

« no previous file with comments | « ui/events/devices/device_data_manager_x11.h ('k') | ui/events/devices/device_data_manager_x11_unittest.cc » ('j') | ui/events/events.gyp » ('J')