Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: extensions/browser/api/system_display/display_info_provider.cc

Issue 2603563002: Plumbs touch calibration API to the display manager (Closed)
Patch Set: It works. The plumbing! Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {

Powered by Google App Engine
This is Rietveld 408576698