- Plumbs through native touch calibration from MD settings to display manager via the system dis…

chrome/browser/extensions/display_info_provider_chromeos.h

Index: chrome/browser/extensions/display_info_provider_chromeos.h
diff --git a/chrome/browser/extensions/display_info_provider_chromeos.h b/chrome/browser/extensions/display_info_provider_chromeos.h
index 85caebc8a34ca7a2d30d0f04be0782c40361f756..b84b04a7f7cc118e6aef1381a902a7f1b7256dcb 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos.h
+++ b/chrome/browser/extensions/display_info_provider_chromeos.h
@@ -20,6 +20,13 @@ namespace extensions {
 
 class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
  public:
+  static const char kCustomTouchCalibrationInProgressError[];
+  static const char kCompleteCalibrationCalledBeforeStartError[];
+  static const char kTouchBoundsNegativeError[];
+  static const char kTouchCalibrationPointsNegativeError[];
+  static const char kTouchCalibrationPointsTooLargeError[];
+  static const char kNativeTouchCalibrationActiveError[];
+
   DisplayInfoProviderChromeOS();
   ~DisplayInfoProviderChromeOS() override;
 
@@ -40,14 +47,18 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
       const api::system_display::Insets& delta) override;
   bool OverscanCalibrationReset(const std::string& id) override;
   bool OverscanCalibrationComplete(const std::string& id) override;
-  bool TouchCalibrationSet(
-      const std::string& id,
+  bool ShowNativeTouchCalibration(
+      const std::string& id, std::string* error,
+      const TouchCalibrationCallback& callback) override;
+  bool StartCustomTouchCalibration(const std::string& id,
+                                   std::string* error) override;
+  bool CompleteCustomTouchCalibration(
       const api::system_display::TouchCalibrationPairQuad& pairs,
       const api::system_display::Bounds& bounds,
       std::string* error) override;
-  bool TouchCalibrationReset(const std::string& id,
+  bool ClearTouchCalibration(const std::string& id,
                              std::string* error) override;
-  bool IsTouchCalibrationActive(std::string* error) override;
+  bool IsNativeTouchCalibrationActive(std::string* error) override;
 
  private:
   chromeos::TouchCalibratorController* GetTouchCalibrator();
@@ -59,6 +70,9 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
 
   std::unique_ptr<chromeos::TouchCalibratorController> touch_calibrator_;
 
+  std::string touch_calibration_target_id_;
+  bool custom_touch_calibration_active_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS);
 };