Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3264)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/touch/touch_hud_debug.cc

Issue 289283015: Extract touchscreen device management into a generic manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 6 months 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
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/touch/touch_transformer_controller.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_hud_debug.cc
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc
index 20fab48588522cc2e61bc44186ee2d6108a32583..363b4794cc9e5a9286a220f6608668184d658772 100644
--- a/ash/touch/touch_hud_debug.cc
+++ b/ash/touch/touch_hud_debug.cc
@@ -27,7 +27,7 @@
#include <X11/extensions/XInput2.h>
#include <X11/Xlib.h>
-#include "ui/events/x/device_data_manager.h"
+#include "ui/events/x/device_data_manager_x11.h"
#endif
namespace ash {
@@ -73,10 +73,10 @@ int GetTrackingId(const ui::TouchEvent& event) {
if (!event.HasNativeEvent())
return 0;
#if defined(USE_XI2_MT)
- ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
+ ui::DeviceDataManagerX11* manager = ui::DeviceDataManagerX11::GetInstance();
double tracking_id;
if (manager->GetEventData(*event.native_event(),
- ui::DeviceDataManager::DT_TOUCH_TRACKING_ID,
+ ui::DeviceDataManagerX11::DT_TOUCH_TRACKING_ID,
&tracking_id)) {
return static_cast<int>(tracking_id);
}
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/touch/touch_transformer_controller.cc » ('j') | chrome/browser/metrics/chromeos_metrics_provider_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698