diff options
| author | pdr@chromium.org <pdr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:36:32 +0000 |
|---|---|---|
| committer | pdr@chromium.org <pdr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:36:32 +0000 |
| commit | f0708edee65ae10b6a9c8188c057f7e0a0d76625 (patch) | |
| tree | faa927fedc78615e9f1ebf0d4eebab2352efc3e7 /ash | |
| parent | 144b6c4d67fe81336112e4d702fb90c7aedb9bbf (diff) | |
| download | chromium_src-f0708edee65ae10b6a9c8188c057f7e0a0d76625.zip chromium_src-f0708edee65ae10b6a9c8188c057f7e0a0d76625.tar.gz chromium_src-f0708edee65ae10b6a9c8188c057f7e0a0d76625.tar.bz2 | |
Revert "Merge CMTEventData and ValuatorTracker"
This reverts commit c754875e2ea7ac0e40e9db77375899d7683b21c2 due to
compile failures: http://build.chromium.org/p/chromium.webkit/builders/GPU%20Linux%20%28dbg%29%20%28NVIDIA%29/builds/15122/steps/compile/logs/stdio
BUG=244253
TBR=sheckylin@chromium.org
Review URL: https://codereview.chromium.org/17049002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -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 a9ac307..e628f89 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/device_data_manager.h" +#include "ui/base/x/valuators.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::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance(); + ui::ValuatorTracker* valuators = ui::ValuatorTracker::GetInstance(); double tracking_id; - if (manager->GetEventData(*event.native_event(), - ui::DeviceDataManager::DT_TOUCH_TRACKING_ID, - &tracking_id)) { + if (valuators->ExtractValuator(*event.native_event(), + ui::ValuatorTracker::VAL_TRACKING_ID, + &tracking_id)) { return static_cast<int>(tracking_id); } #endif |