Updates display manager and display preferences to handle touch calibration data.

ui/display/manager/display_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 #define UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 146 matching lines @@
   // the default mode.
   bool ResetDisplayToDefaultMode(int64_t display_id);
 
   // Sets the external display's configuration, including resolution change,
   // ui-scale change, and device scale factor change. Returns true if it changes
   // the display resolution so that the caller needs to show a notification in
   // case the new resolution actually doesn't work.
   bool SetDisplayMode(int64_t display_id,
                       const scoped_refptr<ManagedDisplayMode>& display_mode);
 
-  // Register per display properties. |overscan_insets| is null if the display
-  // has no custom overscan insets.
-  void RegisterDisplayProperty(int64_t display_id,
-                               Display::Rotation rotation,
-                               float ui_scale,
-                               const gfx::Insets* overscan_insets,
-                               const gfx::Size& resolution_in_pixels,
-                               float device_scale_factor,
-                               ui::ColorCalibrationProfile color_profile);
+  // Register per display properties.
+  // |overscan_insets| is null if the display has no custom overscan insets.
+  // |touch_calibration_data| is null if the display has no touch calibration
+  // associated data.
+  void RegisterDisplayProperty(
+      int64_t display_id,
+      Display::Rotation rotation,
+      float ui_scale,
+      const gfx::Insets* overscan_insets,
+      const gfx::Size& resolution_in_pixels,
+      float device_scale_factor,
+      ui::ColorCalibrationProfile color_profile,
+      const TouchCalibrationData* touch_calibration_data);
 
   // Register stored rotation properties for the internal display.
   void RegisterDisplayRotationProperties(bool rotation_lock,
                                          Display::Rotation rotation);
 
   // Returns the stored rotation lock preference if it has been loaded,
   // otherwise false.
   bool registered_internal_display_rotation_lock() const {
     return registered_internal_display_rotation_lock_;
   }
@@ skipping 102 matching lines @@
 
   // Used to emulate display change when run in a desktop environment instead
   // of on a device.
   void AddRemoveDisplay();
   void ToggleDisplayScaleFactor();
 
 // SoftwareMirroringController override:
 #if defined(OS_CHROMEOS)
   void SetSoftwareMirroring(bool enabled) override;
   bool SoftwareMirroringEnabled() const override;
+  void SetTouchCalibrationData(
+      int64_t display_id,
+      const TouchCalibrationData::CalibrationPointPairQuad& point_pair_quad,
+      const gfx::Size& display_bounds);
+  void ClearTouchCalibrationData(int64_t display_id);
 #endif
 
   // Sets/gets default multi display mode.
   void SetDefaultMultiDisplayModeForCurrentDisplays(MultiDisplayMode mode);
   MultiDisplayMode current_default_multi_display_mode() const {
     return current_default_multi_display_mode_;
   }
 
   // Sets multi display mode.
   void SetMultiDisplayMode(MultiDisplayMode mode);
@@ skipping 148 matching lines @@
   base::ObserverList<DisplayObserver> observers_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_DISPLAY_MANAGER_H_