| 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 10bb9052359faf230c57794206b50b31c7c4d724..1b207ae019548a91dcf24ebef582e768a99b6ff4 100644
|
| --- a/extensions/browser/api/system_display/display_info_provider.cc
|
| +++ b/extensions/browser/api/system_display/display_info_provider.cc
|
| @@ -126,19 +126,21 @@ bool DisplayInfoProvider::TouchCalibrationStart(const std::string& id) {
|
| bool DisplayInfoProvider::TouchCalibrationSet(
|
| const std::string& id,
|
| const api::system_display::TouchCalibrationPairQuad& pairs,
|
| - const api::system_display::Bounds& bounds) {
|
| + const api::system_display::Bounds& bounds,
|
| + std::string* error) {
|
| NOTREACHED(); // Implemented on Chrome OS only in override.
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id) {
|
| +bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id,
|
| + std::string* error) {
|
| NOTREACHED(); // Implemented on Chrome OS only in override.
|
| return false;
|
| }
|
|
|
| -bool DisplayInfoProvider::IsTouchCalibrationActive(const std::string& id) {
|
| - NOTREACHED(); // Implemented on Chrome OS only in override.
|
| - return false;
|
| +bool DisplayInfoProvider::IsTouchCalibrationActive(std::string* error) {
|
| + NOTREACHED(); // Implemented on Chrome OS only in override.
|
| + return true;
|
| }
|
|
|
| DisplayInfoProvider::DisplayInfoProvider() {
|
|
|