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

extensions/browser/api/system_display/display_info_provider.h

Index: extensions/browser/api/system_display/display_info_provider.h
diff --git a/extensions/browser/api/system_display/display_info_provider.h b/extensions/browser/api/system_display/display_info_provider.h
index 3ab6357b726e4da0e7990a1f5d82db6e9551e9f5..e0c2a5f8afd33f0b560ca39e0c8353247bf57974 100644
--- a/extensions/browser/api/system_display/display_info_provider.h
+++ b/extensions/browser/api/system_display/display_info_provider.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/callback_forward.h"
 #include "base/macros.h"
 
 namespace display {
@@ -33,6 +34,7 @@ class DisplayInfoProvider {
  public:
   using DisplayUnitInfoList = std::vector<api::system_display::DisplayUnitInfo>;
   using DisplayLayoutList = std::vector<api::system_display::DisplayLayout>;
+  using TouchCalibrationCallback = base::Callback<void(bool)>;
 
   virtual ~DisplayInfoProvider();
 
@@ -74,15 +76,20 @@ class DisplayInfoProvider {
   virtual bool OverscanCalibrationComplete(const std::string& id);
 
   // Implements touch calibration methods. See system_display.idl. This returns
-  // false if |id| is invalid.
-  virtual bool TouchCalibrationStart(const std::string& id);
-  virtual bool TouchCalibrationSet(
+  // false in case any error occurs. In such cases the |error| string will also
+  // be set.
+  virtual bool ShowNativeTouchCalibration(
       const std::string& id,
+      std::string* error,
+      const TouchCalibrationCallback& callback);
+  virtual bool StartCustomTouchCalibration(const std::string& id,
+                                           std::string* error);
+  virtual bool CompleteCustomTouchCalibration(
       const api::system_display::TouchCalibrationPairQuad& pairs,
       const api::system_display::Bounds& bounds,
       std::string* error);
-  virtual bool TouchCalibrationReset(const std::string& id, std::string* error);
-  virtual bool IsTouchCalibrationActive(std::string* error);
+  virtual bool ClearTouchCalibration(const std::string& id, std::string* error);
+  virtual bool IsNativeTouchCalibrationActive(std::string* error);
 
  protected:
   DisplayInfoProvider();