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

Unified Diff: ui/display/manager/managed_display_info.h

Issue 2540383002: Updates display manager and display preferences to handle touch calibration data. (Closed)
Patch Set: Merge with ToT Created 4 years 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 | « ui/display/manager/display_manager.cc ('k') | ui/display/manager/managed_display_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/manager/managed_display_info.h
diff --git a/ui/display/manager/managed_display_info.h b/ui/display/manager/managed_display_info.h
index 57c259b2806ca31792701a5ead4b577a88d07e81..ff530b0e36c0103021c2625dc881d048c58a581d 100644
--- a/ui/display/manager/managed_display_info.h
+++ b/ui/display/manager/managed_display_info.h
@@ -6,7 +6,7 @@
#define UI_DISPLAY_MANAGER_MANAGED_DISPLAY_INFO_H_
#include <stdint.h>
-
+#include <algorithm>
#include <array>
#include <map>
#include <string>
@@ -34,6 +34,15 @@ struct DISPLAY_MANAGER_EXPORT TouchCalibrationData {
const gfx::Size& bounds);
TouchCalibrationData(const TouchCalibrationData& calibration_data);
+ static bool CalibrationPointPairCompare(const CalibrationPointPair& pair_1,
+ const CalibrationPointPair& pair_2) {
+ return pair_1.first.y() < pair_2.first.y()
+ ? true
+ : pair_1.first.x() < pair_2.first.x();
+ }
+
+ bool operator==(TouchCalibrationData other) const;
+
// Calibration point pairs used during calibration. Each point pair contains a
// display point and the corresponding touch point.
CalibrationPointPairQuad point_pairs;
« no previous file with comments | « ui/display/manager/display_manager.cc ('k') | ui/display/manager/managed_display_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698