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

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/extensions/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/shell.h"
+#include "ash/touch/ash_touch_transform_controller.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/display/overscan_calibrator.h"
 #include "chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/display_layout_builder.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/types/display_constants.h"
@@ skipping 631 matching lines @@
     const std::string& id) {
   VLOG(1) << "OverscanCalibrationComplete: " << id;
   chromeos::OverscanCalibrator* calibrator = GetOverscanCalibrator(id);
   if (!calibrator)
     return false;
   calibrator->Commit();
   overscan_calibrators_[id].reset();
   return true;
 }
 
-bool DisplayInfoProviderChromeOS::TouchCalibrationSet(
-    const std::string& id,
-    const api::system_display::TouchCalibrationPairQuad& pairs,
-    const api::system_display::Bounds& bounds,
-    std::string* error) {
-  VLOG(1) << "TouchCalibrationSet: " << id;
+bool DisplayInfoProviderChromeOS::ShowNativeTouchCalibration(
+    const std::string& id, std::string* error,
+    const DisplayInfoProvider::TouchCalibrationCallback& callback) {
+  VLOG(1) << "StartNativeTouchCalibration: " << id;
+
+  if (custom_touch_calibration_active_) {
+    *error = "Please complete the custom touch calibration that is under "
+             "progress for id - " + touch_calibration_target_id_ + " before "
+             "calling this method.";
+    return false;
+  }
 
   const display::Display display = GetDisplay(id);
   if (!ValidateParamsForTouchCalibration(id, display, GetTouchCalibrator(),
                                          error)) {
     return false;
   }
 
+  GetTouchCalibrator()->AddCallback(callback);
+  GetTouchCalibrator()->StartCalibration(display);
+  return true;
+}
+
+bool DisplayInfoProviderChromeOS::StartCustomTouchCalibration(
+    const std::string& id,
+    std::string* error) {
+  VLOG(1) << "StartCustomTouchCalibration: " << id;
+  const display::Display display = GetDisplay(id);
+  if (!ValidateParamsForTouchCalibration(id, display, GetTouchCalibrator(),
+                                         error)) {
+    return false;
+  }
+
+  touch_calibration_target_id_ = id;
+  custom_touch_calibration_active_ = true;
+
+  // Enable un-transformed touch input.
+  ash::Shell::GetInstance()->touch_transformer_controller()->SetForCalibration(
+      true);
+  return true;
+}
+
+bool DisplayInfoProviderChromeOS::CompleteCustomTouchCalibration(
+    const api::system_display::TouchCalibrationPairQuad& pairs,
+    const api::system_display::Bounds& bounds,
+    std::string* error) {
+  VLOG(1) << "CompleteCustomTouchCalibration: " << touch_calibration_target_id_;
+
+  ash::Shell::GetInstance()->touch_transformer_controller()->SetForCalibration(
+      false);
+
+  const display::Display display = GetDisplay(touch_calibration_target_id_);
+  touch_calibration_target_id_ = "";
+
+  if (!custom_touch_calibration_active_) {
+    *error = "Please call system.display.startCustomTouchCalibration before "
+             "calling this method.";
+    return false;
+  }
+
+  custom_touch_calibration_active_ = false;
+
+  if (!ValidateParamsForTouchCalibration(
+      touch_calibration_target_id_, display, GetTouchCalibrator(), error)) {
+    return false;
+  }
+
   display::TouchCalibrationData::CalibrationPointPairQuad calibration_points;
   calibration_points[0] = GetCalibrationPair(pairs.pair1);
   calibration_points[1] = GetCalibrationPair(pairs.pair2);
   calibration_points[2] = GetCalibrationPair(pairs.pair3);
   calibration_points[3] = GetCalibrationPair(pairs.pair4);
 
   // The display bounds cannot have negative values.
   if (bounds.width < 0 || bounds.height < 0) {
     *error = "Bounds cannot have negative values.";
     return false;
@@ skipping 17 matching lines @@
       return false;
     }
   }
 
   gfx::Size display_size(bounds.width, bounds.height);
   ash::Shell::GetInstance()->display_manager()->SetTouchCalibrationData(
       display.id(), calibration_points, display_size);
   return true;
 }
 
-bool DisplayInfoProviderChromeOS::TouchCalibrationReset(const std::string& id,
+bool DisplayInfoProviderChromeOS::ResetTouchCalibration(const std::string& id,
                                                         std::string* error) {
   const display::Display display = GetDisplay(id);
 
   if (!ValidateParamsForTouchCalibration(id, display, GetTouchCalibrator(),
                                          error)) {
     return false;
   }
 
   ash::Shell::GetInstance()->display_manager()->ClearTouchCalibrationData(
       display.id());
   return true;
 }
 
-bool DisplayInfoProviderChromeOS::IsTouchCalibrationActive(std::string* error) {
+bool DisplayInfoProviderChromeOS::IsNativeTouchCalibrationActive(
+    std::string* error) {
   if (GetTouchCalibrator()->is_calibrating()) {
     *error = "Another touch calibration is already active.";
     return true;
   }
   return false;
 }
 
 chromeos::OverscanCalibrator*
 DisplayInfoProviderChromeOS::GetOverscanCalibrator(const std::string& id) {
   auto iter = overscan_calibrators_.find(id);
   if (iter == overscan_calibrators_.end())
     return nullptr;
   return iter->second.get();
 }
 
 chromeos::TouchCalibratorController*
 DisplayInfoProviderChromeOS::GetTouchCalibrator() {
   if (!touch_calibrator_)
     touch_calibrator_.reset(new chromeos::TouchCalibratorController);
   return touch_calibrator_.get();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions