Chromium Code Reviews| Index: ash/touch/touch_transformer_controller.h |
| diff --git a/ash/touch/touch_transformer_controller.h b/ash/touch/touch_transformer_controller.h |
| index 640fcbb8c8f499de202b8db3080bafbbe691e33c..6fdf5fbb53a78b691775fbb7e44610ffe4780321 100644 |
| --- a/ash/touch/touch_transformer_controller.h |
| +++ b/ash/touch/touch_transformer_controller.h |
| @@ -35,14 +35,12 @@ class ASH_EXPORT TouchTransformerController |
| void OnDisplaysInitialized() override; |
| void OnDisplayConfigurationChanged() override; |
| + // During touch calibration we remove any kind of transform that is being |
|
kylechar
2016/12/22 16:56:00
You removed this from the cc file but not h file.
malaykeshav
2016/12/22 19:48:50
Done.
|
| + // applied to the touch input's location. |
| + void SetForCalibration(bool is_calibrating); |
| + |
| private: |
| - FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, |
| - MirrorModeLetterboxing); |
| - FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, |
| - MirrorModePillarboxing); |
| - FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, SoftwareMirrorMode); |
| - FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, ExtendedMode); |
| - FRIEND_TEST_ALL_PREFIXES(TouchTransformerControllerTest, TouchRadiusScale); |
| + friend class TouchTransformerControllerTest; |
| // Returns a transform that will be used to change an event's location from |
| // the touchscreen's coordinate system into |display|'s coordinate system. |
| @@ -82,6 +80,8 @@ class ASH_EXPORT TouchTransformerController |
| const display::ManagedDisplayInfo& touch_display, |
| const display::ManagedDisplayInfo& target_display) const; |
| + bool is_calibrating_ = false; |
|
kylechar
2016/12/22 16:56:00
Likewise, you seem to have removed the usage of th
malaykeshav
2016/12/22 19:48:50
Done
|
| + |
| DISALLOW_COPY_AND_ASSIGN(TouchTransformerController); |
| }; |