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

Unified Diff: ui/events/devices/device_data_manager.h

Issue 1071193002: Change device IDs from unsigned to signed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: check for negative IDs Created 5 years, 8 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 | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | ui/events/devices/device_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/device_data_manager.h
diff --git a/ui/events/devices/device_data_manager.h b/ui/events/devices/device_data_manager.h
index f58350f8279de705158e08ac31b8d4e9b51ab033..674676ec93552d4170139bd0a9f244dd25a880a6 100644
--- a/ui/events/devices/device_data_manager.h
+++ b/ui/events/devices/device_data_manager.h
@@ -35,15 +35,15 @@ class EVENTS_DEVICES_EXPORT DeviceDataManager
void ClearTouchDeviceAssociations();
void UpdateTouchInfoForDisplay(int64_t target_display_id,
- unsigned int touch_device_id,
+ int touch_device_id,
const gfx::Transform& touch_transformer);
- void ApplyTouchTransformer(unsigned int touch_device_id, float* x, float* y);
+ void ApplyTouchTransformer(int touch_device_id, float* x, float* y);
// Gets the display that touches from |touch_device_id| should be sent to.
- int64_t GetTargetDisplayForTouchDevice(unsigned int touch_device_id) const;
+ int64_t GetTargetDisplayForTouchDevice(int touch_device_id) const;
- void UpdateTouchRadiusScale(unsigned int touch_device_id, double scale);
- void ApplyTouchRadiusScale(unsigned int touch_device_id, double* radius);
+ void UpdateTouchRadiusScale(int touch_device_id, double scale);
+ void ApplyTouchRadiusScale(int touch_device_id, double* radius);
const std::vector<TouchscreenDevice>& touchscreen_devices() const {
return touchscreen_devices_;
@@ -74,7 +74,7 @@ class EVENTS_DEVICES_EXPORT DeviceDataManager
private:
static DeviceDataManager* instance_;
- bool IsTouchDeviceIdValid(unsigned int touch_device_id) const;
+ bool IsTouchDeviceIdValid(int touch_device_id) const;
double touch_radius_scale_map_[kMaxDeviceNum];
« no previous file with comments | « chrome/browser/chromeos/events/event_rewriter_unittest.cc ('k') | ui/events/devices/device_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698