diff options
| author | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:46:21 +0000 |
|---|---|---|
| committer | sheckylin@chromium.org <sheckylin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 06:46:21 +0000 |
| commit | c754875e2ea7ac0e40e9db77375899d7683b21c2 (patch) | |
| tree | 9e26f2a28dd0d34c7c8c3241f40bce05e85af48b /ash/touch/touch_observer_hud.cc | |
| parent | 901e511640a9b97a8e711d0caa578fc9810b2541 (diff) | |
| download | chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.zip chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.tar.gz chromium_src-c754875e2ea7ac0e40e9db77375899d7683b21c2.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
Review URL: https://chromiumcodereview.appspot.com/15705004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch/touch_observer_hud.cc')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index e628f89..a9ac307 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -36,7 +36,7 @@ #include <X11/extensions/XInput2.h> #include <X11/Xlib.h> -#include "ui/base/x/valuators.h" +#include "ui/base/x/device_data_manager.h" #endif namespace ash { @@ -88,11 +88,11 @@ int GetTrackingId(const ui::TouchEvent& event) { if (!event.HasNativeEvent()) return 0; #if defined(USE_XI2_MT) - ui::ValuatorTracker* valuators = ui::ValuatorTracker::GetInstance(); + ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance(); double tracking_id; - if (valuators->ExtractValuator(*event.native_event(), - ui::ValuatorTracker::VAL_TRACKING_ID, - &tracking_id)) { + if (manager->GetEventData(*event.native_event(), + ui::DeviceDataManager::DT_TOUCH_TRACKING_ID, + &tracking_id)) { return static_cast<int>(tracking_id); } #endif |