Plumbs touch calibration API to the display manager

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 d0a173ddf39cc57d677c5c4f5be00d319a965008..ab173dec9390e6d046785372a245365644337638 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos.h
+++ b/chrome/browser/extensions/display_info_provider_chromeos.h
@@ -13,6 +13,7 @@
 
 namespace chromeos {
 class OverscanCalibrator;
+class TouchCalibratorController;
 }
 
 namespace extensions {
@@ -39,12 +40,23 @@ 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,
+      const api::system_display::TouchCalibrationPairQuad& pairs,
+      const api::system_display::Bounds& bounds,
+      std::string* error) override;
+  bool TouchCalibrationReset(const std::string& id,
+                             std::string* error) override;
 
  private:
   std::map<std::string, std::unique_ptr<chromeos::OverscanCalibrator>>
       overscan_calibrators_;
 
-  chromeos::OverscanCalibrator* GetCalibrator(const std::string& id);
+  std::unique_ptr<chromeos::TouchCalibratorController> touch_calibrator_;
+
+  chromeos::TouchCalibratorController* GetTouchCalibrator();
+
+  chromeos::OverscanCalibrator* GetOverscanCalibrator(const std::string& id);

[stevenjb, 2016/12/27 19:37:27]

nit: Order here should really be:

private methods

private members

[malaykeshav, 2016/12/27 20:07:01]

Done

 
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS);
 };