| Index: extensions/browser/api/system_display/display_info_provider.cc
|
| diff --git a/extensions/browser/api/system_display/display_info_provider.cc b/extensions/browser/api/system_display/display_info_provider.cc
|
| index dc186e25a4bbb323a55e8fc58dd70644f2ab8645..e6c75ef15612b03585be3cd92b480d95cb9bdad0 100644
|
| --- a/extensions/browser/api/system_display/display_info_provider.cc
|
| +++ b/extensions/browser/api/system_display/display_info_provider.cc
|
| @@ -120,13 +120,21 @@ bool DisplayInfoProvider::OverscanCalibrationComplete(const std::string& id) {
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::TouchCalibrationStart(const std::string& id) {
|
| +bool DisplayInfoProvider::ShowNativeTouchCalibration(
|
| + const std::string& id,
|
| + std::string* error,
|
| + const TouchCalibrationCallback& callback) {
|
| NOTREACHED(); // Implemented on Chrome OS only in override.
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::TouchCalibrationSet(
|
| - const std::string& id,
|
| +bool DisplayInfoProvider::StartCustomTouchCalibration(const std::string& id,
|
| + std::string* error) {
|
| + NOTREACHED(); // Implemented on Chrome OS only in override.
|
| + return false;
|
| +}
|
| +
|
| +bool DisplayInfoProvider::CompleteCustomTouchCalibration(
|
| const api::system_display::TouchCalibrationPairQuad& pairs,
|
| const api::system_display::Bounds& bounds,
|
| std::string* error) {
|
| @@ -134,13 +142,13 @@ bool DisplayInfoProvider::TouchCalibrationSet(
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id,
|
| +bool DisplayInfoProvider::ClearTouchCalibration(const std::string& id,
|
| std::string* error) {
|
| NOTREACHED(); // Implemented on Chrome OS only in override.
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::IsTouchCalibrationActive(std::string* error) {
|
| +bool DisplayInfoProvider::IsNativeTouchCalibrationActive(std::string* error) {
|
| NOTREACHED(); // Implemented on Chrome OS only in override.
|
| return true;
|
| }
|
|
|