ui/events/platform/x11/x11_event_source.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/platform/x11/x11_event_source.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/events/platform/x11/x11_event_source.cc

diff --git a/ui/events/platform/x11/x11_event_source.cc b/ui/events/platform/x11/x11_event_source.cc

index b2f5dfac6f7b81a243bd5ddfb77d58d46e48fbd0..9268c425ca5ec6afc2fbbce33a4bd99c76ac33af 100644

--- a/ui/events/platform/x11/x11_event_source.cc

+++ b/ui/events/platform/x11/x11_event_source.cc

@@ -10,10 +10,10 @@

#include <X11/XKBlib.h>

#include "base/logging.h"

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

#include "ui/events/event_utils.h"

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

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

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

+#include "ui/events/platform/x11/x11_hotplug_event_handler.h"

#include "ui/gfx/x/x11_types.h"

namespace ui {

@@ -87,7 +87,7 @@ X11EventSource::X11EventSource(XDisplay* display)

CHECK(display_);

DeviceDataManagerX11::CreateInstance();

hotplug_event_handler_.reset(

- new HotplugEventHandlerX11(DeviceDataManager::GetInstance()));

+ new X11HotplugEventHandler(DeviceDataManager::GetInstance()));

InitializeXInput2(display_);

InitializeXkb(display_);

« no previous file with comments | « ui/events/platform/x11/x11_event_source.h ('k') | ui/events/platform/x11/x11_events_platform.gyp » ('j') | no next file with comments »