diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 17:11:08 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 17:11:08 +0000 |
| commit | 627e8ab70fb5070ae20a25f9bcdab17f0a3d7401 (patch) | |
| tree | 2b295cbb6cf716c10d4a98bcc66088c567a65797 /ui/aura | |
| parent | cf63894b4381136cafeb406e25693c062e8f47ec (diff) | |
| download | chromium_src-627e8ab70fb5070ae20a25f9bcdab17f0a3d7401.zip chromium_src-627e8ab70fb5070ae20a25f9bcdab17f0a3d7401.tar.gz chromium_src-627e8ab70fb5070ae20a25f9bcdab17f0a3d7401.tar.bz2 | |
Extract touchscreen device management into a generic manager
DeviceDataManager is currently X11 specific, so CrOS code that is responsible for touchscreen management would only work under X11. This CL starts extracting device state as generic state that X11 and Ozone implementations can share.
BUG=375848
Review URL: https://codereview.chromium.org/289283015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/window_tree_host_x11.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc index c3dcb19..f2604eb7 100644 --- a/ui/aura/window_tree_host_x11.cc +++ b/ui/aura/window_tree_host_x11.cc @@ -41,7 +41,7 @@ #include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/platform/platform_event_observer.h" #include "ui/events/platform/x11/x11_event_source.h" -#include "ui/events/x/device_data_manager.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/screen.h" @@ -454,7 +454,7 @@ uint32_t WindowTreeHostX11::DispatchEvent(const ui::PlatformEvent& event) { XRefreshKeyboardMapping(&xev->xmapping); break; case MappingPointer: - ui::DeviceDataManager::GetInstance()->UpdateButtonMap(); + ui::DeviceDataManagerX11::GetInstance()->UpdateButtonMap(); break; default: NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request; @@ -663,7 +663,7 @@ void WindowTreeHostX11::DispatchXI2Event(const base::NativeEvent& event) { case ui::ET_TOUCH_CANCELLED: case ui::ET_TOUCH_RELEASED: { ui::TouchEvent touchev(xev); - if (ui::DeviceDataManager::GetInstance()->TouchEventNeedsCalibrate( + if (ui::DeviceDataManagerX11::GetInstance()->TouchEventNeedsCalibrate( xiev->deviceid)) { touch_calibrate_->Calibrate(&touchev, bounds_); } |