ui/events/x/events_x.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/x/events_x.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/x/events_x.cc

diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc

index e6fb3120d3e095b61fb387351a0be66f2fae5835..a491884886f93d95d936d37506a0a71353141009 100644

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

+++ b/ui/events/x/events_x.cc

@@ -14,12 +14,12 @@

#include "base/logging.h"

#include "base/memory/singleton.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_utils.h"

#include "ui/events/keycodes/keyboard_code_conversion_x.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/display.h"

#include "ui/gfx/point.h"

#include "ui/gfx/rect.h"

@@ -358,7 +358,7 @@ namespace ui {

void UpdateDeviceList() {

XDisplay* display = gfx::GetXDisplay();

- DeviceListCacheX::GetInstance()->UpdateDeviceList(display);

+ DeviceListCacheX11::GetInstance()->UpdateDeviceList(display);

TouchFactory::GetInstance()->UpdateDeviceList(display);

DeviceDataManagerX11::GetInstance()->UpdateDeviceList(display);

}

« no previous file with comments | « ui/events/x/device_list_cache_x.cc ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »