| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/browser/api/system_display/display_info_provider.h" | 5 #include "extensions/browser/api/system_display/display_info_provider.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "extensions/common/api/system_display.h" | 8 #include "extensions/common/api/system_display.h" |
| 9 #include "ui/display/display.h" | 9 #include "ui/display/display.h" |
| 10 #include "ui/display/screen.h" | 10 #include "ui/display/screen.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 } | 119 } |
| 120 | 120 |
| 121 bool DisplayInfoProvider::TouchCalibrationStart(const std::string& id) { | 121 bool DisplayInfoProvider::TouchCalibrationStart(const std::string& id) { |
| 122 NOTREACHED(); // Implemented on Chrome OS only in override. | 122 NOTREACHED(); // Implemented on Chrome OS only in override. |
| 123 return false; | 123 return false; |
| 124 } | 124 } |
| 125 | 125 |
| 126 bool DisplayInfoProvider::TouchCalibrationSet( | 126 bool DisplayInfoProvider::TouchCalibrationSet( |
| 127 const std::string& id, | 127 const std::string& id, |
| 128 const api::system_display::TouchCalibrationPairQuad& pairs, | 128 const api::system_display::TouchCalibrationPairQuad& pairs, |
| 129 const api::system_display::Bounds& bounds) { | 129 const api::system_display::Bounds& bounds, |
| 130 std::string* error) { |
| 130 NOTREACHED(); // Implemented on Chrome OS only in override. | 131 NOTREACHED(); // Implemented on Chrome OS only in override. |
| 131 return false; | 132 return false; |
| 132 } | 133 } |
| 133 | 134 |
| 134 bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id) { | 135 bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id, |
| 136 std::string* error) { |
| 135 NOTREACHED(); // Implemented on Chrome OS only in override. | 137 NOTREACHED(); // Implemented on Chrome OS only in override. |
| 136 return false; | 138 return false; |
| 137 } | 139 } |
| 138 | 140 |
| 139 bool DisplayInfoProvider::IsTouchCalibrationActive(const std::string& id) { | 141 bool DisplayInfoProvider::IsTouchCalibrationActive(std::string* error) { |
| 140 NOTREACHED(); // Implemented on Chrome OS only in override. | 142 NOTREACHED(); // Implemented on Chrome OS only in override. |
| 141 return false; | 143 return true; |
| 142 } | 144 } |
| 143 | 145 |
| 144 DisplayInfoProvider::DisplayInfoProvider() { | 146 DisplayInfoProvider::DisplayInfoProvider() { |
| 145 } | 147 } |
| 146 | 148 |
| 147 } // namespace extensions | 149 } // namespace extensions |
| OLD | NEW |