Updates touch calibration API and plumbs through the native touch calibration method

third_party/closure_compiler/externs/system_display.js

 // Copyright 2016 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.
 
 // This file was generated by:
 //   ./tools/json_schema_compiler/compiler.py.
 // NOTE: The format of types has changed. 'FooType' is now
 //   'chrome.system.display.FooType'.
 // Please run the closure compiler before committing changes.
 // See https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
@@ skipping 220 matching lines @@
 
 /**
  * Complete overscan adjustments for a display  by saving the current values and
  * hiding the overlay.
  * @param {string} id The display's unique identifier.
  * @see https://developer.chrome.com/extensions/system.display#method-overscanCalibrationComplete
  */
 chrome.system.display.overscanCalibrationComplete = function(id) {};
 
 /**
- * Starts touch calibration for a display. This will show an overlay on the
- * screen and initialize the UX for touch calibration. If touch calibration for
- * display |id| is in progress this will reset calibration.
+ * Starts native touch calibration for a display. This will show an overlay on
+ * the screen and initialize the UX for touch calibration. If another native
+ * touch calibration is already in progress this will throw an error.
  * @param {string} id The display's unique identifier.
- * @see https://developer.chrome.com/extensions/system.display#method-touchCalibrationStart
+ * @see https://developer.chrome.com/extensions/system.display#method-showNativeTouchCalibration
  */
-chrome.system.display.touchCalibrationStart = function(id) {};
+chrome.system.display.showNativeTouchCalibration = function(id) {};
+
+/**
+ * Starts custom touch calibration for a display. This should be called when
+ * using a custom UX for collecting calibration data. If another touch
+ * calibration is already in progress this will throw an error.
+ * @param {string} id The display's unique identifier.
+ * @see https://developer.chrome.com/extensions/system.display#method-startCustomTouchCalibration
+ */
+chrome.system.display.startCustomTouchCalibration = function(id) {};
 
 /**
  * Sets the touch calibration pairs for a display. These |pairs| would be used
- * to calibrate the touch screen for display |id|. If touch calibration for
- * display |id| is in progress this will do nothing.
- * @param {string} id The display's unique identifier.
+ * to calibrate the touch screen for display with |id| called in
+ * startCustomTouchCalibration(). Always call |startCustomTouchCalibration|
+ * before calling this method. If another touch calibration is already in
+ * progress this will throw an error.
  * @param {!chrome.system.display.TouchCalibrationPairQuad} pairs The pairs of
  *     point used to calibrate the display.
  * @param {!chrome.system.display.Bounds} bounds Bounds of the display when the
  *     touch calibration was performed. |bounds.left| and |bounds.top|
- *     values are no-op.
- * @see https://developer.chrome.com/extensions/system.display#method-touchCalibrationSet
+ *     values are ignored.
+ * @see https://developer.chrome.com/extensions/system.display#method-completeCustomTouchCalibration
  */
-chrome.system.display.touchCalibrationSet = function(id, pairs, bounds) {};
+chrome.system.display.completeCustomTouchCalibration = function(pairs, bounds) {};
 
 /**
  * Resets the touch calibration for the display and removes the saved
  * calibration data.
  * @param {string} id The display's unique identifier.
- * @see https://developer.chrome.com/extensions/system.display#method-touchCalibrationReset
+ * @see https://developer.chrome.com/extensions/system.display#method-clearTouchCalibration
  */
-chrome.system.display.touchCalibrationReset = function(id) {};
+chrome.system.display.clearTouchCalibration = function(id) {};
 
 /**
  * Fired when anything changes to the display configuration.
  * @type {!ChromeEvent}
  * @see https://developer.chrome.com/extensions/system.display#event-onDisplayChanged
  */
 chrome.system.display.onDisplayChanged;