summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authorsheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 06:34:15 +0000
committersheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-17 06:34:15 +0000
commit0341e5eef49ac53848e7a6c7eefd96687712c6ca (patch)
tree15c7ee7b48e70685c1d4765e78bbe9d837728190 /ui/ui.gyp
parent1bb59f82e927cee3e7e0830f8723e4286027def7 (diff)
downloadchromium_src-0341e5eef49ac53848e7a6c7eefd96687712c6ca.zip
chromium_src-0341e5eef49ac53848e7a6c7eefd96687712c6ca.tar.gz
chromium_src-0341e5eef49ac53848e7a6c7eefd96687712c6ca.tar.bz2
Merge CMTEventData and ValuatorTracker
The patch merges the CMTEventData class in event_x.cc with the ValuatorTracker class into an unified class DeviceDataManager that deals with all X valuator data extraction tasks. It provides new APIs for checking X event types, extracting values from X valuators and more. It currently handles mouses, touchpads and touchscreens. Contributed by sheckylin@chromium.org BUG=244253 TEST=Tested on device. Change-Id: I19208c876a4da6865a86a540bff36db32997bfe0 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=206336 Review URL: https://chromiumcodereview.appspot.com/15705004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index ea2ebc3..0b55416 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -378,6 +378,8 @@
'base/x/active_window_watcher_x.cc',
'base/x/active_window_watcher_x.h',
'base/x/active_window_watcher_x_observer.h',
+ 'base/x/device_data_manager.cc',
+ 'base/x/device_data_manager.h',
'base/x/device_list_cache_x.cc',
'base/x/device_list_cache_x.h',
'base/x/events_x.cc',
@@ -389,8 +391,6 @@
'base/x/selection_requestor.h',
'base/x/selection_utils.cc',
'base/x/selection_utils.h',
- 'base/x/valuators.cc',
- 'base/x/valuators.h',
'base/x/work_area_watcher_x.cc',
'base/x/work_area_watcher_x.h',
'base/x/x11_atom_cache.cc',